Skip to content

Merge rebase branch#536

Merged
exalab999 merged 12 commits into
masterfrom
rebase
Jul 14, 2026
Merged

Merge rebase branch#536
exalab999 merged 12 commits into
masterfrom
rebase

Conversation

@supersonictw

@supersonictw supersonictw commented Jul 14, 2026

Copy link
Copy Markdown
Member

This pull request consolidates several updates, including translation enhancements, documentation fixes, and local asset adjustments.

Summary of Changes

  1. Simplified Chinese Translation Improvements (strings.xml)

    • Cleaned up mixed Traditional/Simplified Chinese characters to standardize fully on Simplified Chinese (zh-CN).
    • Standardized software terminology for clarity and consistency (e.g., 指令 -> 命令, 贴上 -> 粘贴, 解除安装 -> 卸载, 回报 -> 反馈/报告, 连结 -> 链接).
    • Fixed a translation bug in nethunter_warning_content where Around 10 minutes was incorrectly translated as 0分钟 (now 10分钟).
  2. Portuguese (Brazilian) Translation Added (strings.xml)

  3. Documentation Updates (README.zh.md)

    • Refined Chinese documentation and updated the path for the Google Play Store badge to point to the correct local directory.
  4. Assets & Builds

    • Added the local Google Play badge image (en_badge_web_generic.png).
    • Standardized execution permissions for the Gradle wrapper (gradlew).

Verification

  • Ran ./gradlew assembleDebug successfully to verify that all XML structures and formats are correct and compile without warnings or errors.

@supersonictw supersonictw requested a review from exalab999 July 14, 2026 03:19
@supersonictw supersonictw self-assigned this Jul 14, 2026
@supersonictw supersonictw added the enhancement New feature or request label Jul 14, 2026
@supersonictw supersonictw requested a review from Copilot July 14, 2026 03:19

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This pull request consolidates localization updates and small project-maintenance changes, primarily improving Simplified Chinese strings, adding a new pt-BR locale file, and adjusting Chinese documentation and build wrapper tooling.

Changes:

  • Refined Simplified Chinese (zh-CN) translations across the app’s string resources.
  • Added a new Portuguese (Brazil) strings.xml locale file.
  • Updated README.zh.md and added the Gradle wrapper script under AnLinux/.

Reviewed changes

Copilot reviewed 3 out of 5 changed files in this pull request and generated 3 comments.

File Description
README.zh.md Updates Chinese README wording and switches the Google Play badge to a local asset reference.
AnLinux/gradlew Adds the Unix Gradle wrapper script to support standardized builds.
AnLinux/app/src/main/res/values-zh-rCN/strings.xml Cleans up and standardizes Simplified Chinese UI strings and instructions.
AnLinux/app/src/main/res/values-pt-rBR/strings.xml Introduces a new pt-BR localization file (currently partial and with a key mismatch).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread README.zh.md Outdated
Comment thread AnLinux/app/src/main/res/values-pt-rBR/strings.xml Outdated
Comment thread AnLinux/app/src/main/res/values-pt-rBR/strings.xml
@supersonictw

Copy link
Copy Markdown
Member Author

@copilot review

Copilot AI commented Jul 14, 2026

Copy link
Copy Markdown

@copilot review

Reviewed the latest state of this PR. The previously flagged items are already addressed in commits 1b229d4 (pt-BR key/completeness) and 23eb7b7 (README badge path), and I don’t see additional actionable changes needed right now.

@supersonictw

Copy link
Copy Markdown
Member Author

@exalab999 review

@exaksana

Copy link
Copy Markdown

Review — #536 Merge Rebase Branch

@supersonictw — 整體品質很高。逐一核對後的觀察:

✅ zh-CN strings.xml — 大規模修正,全正收益

  • 打開/關閉抽屜打開/關閉導航抽屜 — 準確(navigation drawer)
  • 好的/拒絕是/否 — 更標準
  • 桌面桌面環境 — 補回 Desktop Environment 完整語意
  • 刪除系統卸載 — 正確對應 uninstall
  • 捐款捐贈 — donation 更準確
  • 回報錯誤報告錯誤 — 繁體→簡體統一
  • 指令命令 全替換 — Linux CLI 標準用語
  • 貼上粘貼 — 簡體中文正字
  • 0分鐘10分鐘這是關鍵修正,nethunter_warning 之前翻譯成 0 分鐘根本誤導用戶。Fixed.
  • first_warning_content 第 1 項補了 且請勿因此質疑發行版的真實性 — 原文無對應。意譯偏離,但語意不惡。
  • root_content0 補了 請注意,在 Root 模式下運行錯誤的命令可能會損壞整個 Android 系統! — 這是原英文沒有的內容,但屬於合理的本地化風險提示,可接受。
  • Ashmem 翻譯從 包掛了 改為 包括...函數 — 修正了 Fix some typos in zh-CN strings.xml #399 Lehmaning 的 包掛了包含了 ambiguity,徹底翻清楚了。比原始翻譯好太多。

✅ values-pt-rBR/strings.xml — 全新巴西葡語翻譯

  • 115 行,完整對齊 strings key — Translation strings.xml PT-BR 🇧🇷 #490 (Jeiel0rbit) 的 58 行版本更完整。原來 Translation strings.xml PT-BR 🇧🇷 #490 缺了 root/wm/heavy_de/wiki/documentation_prompt/bug_report 等大量 key。
  • Key ordering 與 en/zh-CN 一致,無遺漏。
  • 翻譯品質我無法深度驗證(非葡語 speaker),但結構完整且用字一致(如 Ambiente de Área de TrabalhoGerenciador de Janelas)。

✅ README.zh.md — 整體改善

  • Google Play badge 改為本地路徑 icons/en_badge_web_generic.png — 解決中國防火牆問題
  • 中英文間加空格,排版標準化
  • 措辭微調:系統鏡像 保持(Update README.zh.md #310 改為 圖像 是錯的),這裡沒動 — 正確。

✅ gradlew — 執行權限修正

  • old mode 100644new mode 100755 — CI 相容性修復,正確。

✅ icons/en_badge_web_generic.png — 本地 badge


⚠️ 一個小問題

README.zh.md 第 45 行 desktop images 翻成 圖像

使用 bash 脚本通过 Internet 下载图像,然后解压缩图像

原文是 system images(系統鏡像),圖像 在中文語境下更像 pictures/images,不如 系統映像 或保持原 系統鏡像 更準確。這個是從 #310 承襲的,不影響 merge。


判定:LGTM

  • zh-CN 翻譯大幅改善,特別是 nethunter 0→10 分鐘 bug fix 和 Ashmem 完整重譯。
  • pt-BR 新翻譯完整度超過 Translation strings.xml PT-BR 🇧🇷 #490
  • README badge 本地化實用。
  • gradlew 權限修正正確。

Copilot 已通過,我這邊也過。建議 merge。

LGTM @exalab999 @supersonictw

@exalab999 exalab999 merged commit b56175c into master Jul 14, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants