From b7017278288da1e8096e02e9e5597762d446bd3b Mon Sep 17 00:00:00 2001
From: Ruling <rulingghost@gmail.com>
Date: Wed, 28 Oct 2020 20:37:39 +0800
Subject: [PATCH 1/2] Add some Chinese language

---
 app_main/src/main/res/values-zh/strings.xml   | 22 ++++----
 nfctag/src/main/res/values-zh/strings.xml     |  3 ++
 .../src/main/res/values-zh/strings.xml        |  5 ++
 termux-app/src/main/res/values-zh/strings.xml | 52 +++++++++++++++++++
 4 files changed, 71 insertions(+), 11 deletions(-)
 create mode 100644 nfctag/src/main/res/values-zh/strings.xml
 create mode 100644 terminal-view/src/main/res/values-zh/strings.xml
 create mode 100644 termux-app/src/main/res/values-zh/strings.xml

diff --git a/app_main/src/main/res/values-zh/strings.xml b/app_main/src/main/res/values-zh/strings.xml
index 2258b991..eb431744 100644
--- a/app_main/src/main/res/values-zh/strings.xml
+++ b/app_main/src/main/res/values-zh/strings.xml
@@ -19,8 +19,8 @@
     </string>
     <string name="mfoc">半加测试</string>
     <string name="mfcuk">全加测试</string>
-    <string name="hardnested">Hard测试</string>
-    <string name="nfclist">近场列表</string>
+    <string name="hardnested">Hard攻击</string>
+    <string name="nfclist">NFC 清单</string>
     <string name="emulate">模拟卡片</string>
     <string name="readtag">读取卡片</string>
     <string name="writetag">刷写卡片</string>
@@ -29,8 +29,8 @@
     <string name="usage">使用帮助</string>
     <string name="disclaimer">免责声明</string>
     <string name="joinGroup">加入Q群</string>
-    <string name="contactDev">联系Dev</string>
-    <string name="sendLog">发送Log</string>
+    <string name="contactDev">联系开发者</string>
+    <string name="sendLog">发送日志</string>
     <string name="clearData">清除数据</string>
     <string name="checkUpdate">检查更新</string>
     <string name="logList">日志列表</string>
@@ -77,9 +77,9 @@
     <string name="command_input">命令输入</string>
     <string name="title_input">标题输入</string>
     <string name="button_edit">按钮编辑</string>
-    <string name="enter_delete">确定删除吗?</string>
-    <string name="yes">是的</string>
-    <string name="no">不</string>
+    <string name="enter_delete">是否确实要将其删除？</string>
+    <string name="yes">是</string>
+    <string name="no">否</string>
     <string name="btn_add">添加按钮</string>
     <string name="success">成功</string>
     <string name="failed">失败</string>
@@ -139,8 +139,8 @@
     <string name="unrepeat_no_line">没有可以被去重的行!</string>
     <string name="keys_show_failed">密钥显示失败</string>
     <string name="file_create_failed">文件创建失败</string>
-    <string name="data_block_diff_count">不同的块计数:</string>
-    <string name="data_char_diff_count">,不同的字符计数:</string>
+    <string name="data_block_diff_count">差异块计数：</string>
+    <string name="data_char_diff_count">，差异字符计数：</string>
     <string name="data_identical">数据完全相同!</string>
     <string name="title_format_convert">格式转换</string>
     <string name="tisp_select_convert_target">请选择转换目标!</string>
@@ -182,8 +182,8 @@
     <string name="language">语言</string>
     <string name="following_system">跟随系统</string>
     <string name="settings">设置</string>
-    <string name="chinese_simple">中文简体</string>
-    <string name="english">English</string>
+    <string name="chinese_simple">简体中文</string>
+    <string name="english">英文</string>
     <string name="msg_language_change_success">切换语言成功，重启后生效。</string>
     <string name="restart">重启</string>
     <string name="keyfiles_no_select">秘钥文件未选择</string>
diff --git a/nfctag/src/main/res/values-zh/strings.xml b/nfctag/src/main/res/values-zh/strings.xml
new file mode 100644
index 00000000..ca166f1e
--- /dev/null
+++ b/nfctag/src/main/res/values-zh/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Mifare标签</string>
+</resources>
diff --git a/terminal-view/src/main/res/values-zh/strings.xml b/terminal-view/src/main/res/values-zh/strings.xml
new file mode 100644
index 00000000..a553ecb6
--- /dev/null
+++ b/terminal-view/src/main/res/values-zh/strings.xml
@@ -0,0 +1,5 @@
+<resources>
+  <string name="paste_text">粘贴</string>
+  <string name="copy_text">复制</string>
+  <string name="text_selection_more">更多…</string>
+</resources>
diff --git a/termux-app/src/main/res/values-zh/strings.xml b/termux-app/src/main/res/values-zh/strings.xml
new file mode 100644
index 00000000..2a2cb5de
--- /dev/null
+++ b/termux-app/src/main/res/values-zh/strings.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>		
+<resources>		
+    <string name="shared_user_label">Termux 用户</string>
+    <string name="run_command_permission_label">在Termux环境中运行命令</string>
+    <string name="run_command_permission_description">允许第三方应用程序在Termux环境中执行任意命令。</string>
+    <string name="new_session">新会话</string>
+    <string name="new_session_failsafe">故障保护</string>
+    <string name="toggle_soft_keyboard">键盘</string>
+    <string name="reset_terminal">重置</string>
+    <string name="style_terminal">样式</string>
+    <string name="share_transcript_title">终端输出</string>
+    <string name="help">帮助</string>
+    <string name="toggle_keep_screen_on">保存屏幕常亮</string>
+
+    <string name="bootstrap_installer_body">正在安装</string>
+    <string name="bootstrap_error_title">无法安装</string>
+    <string name="bootstrap_error_body">Termux无法安装引导程序包。</string>
+    <string name="bootstrap_error_abort">放弃</string>
+    <string name="bootstrap_error_try_again">再尝试一次</string>
+    <string name="bootstrap_error_not_primary_user_message">Termux只能安装在主用户帐户上。</string>
+
+    <string name="max_terminals_reached_title">已达到最大终端数</string>
+    <string name="max_terminals_reached_message">在创建新的之前需要关闭现有的。</string>
+		
+    <string name="reset_toast_notification">重置终端.</string>
+	
+    <string name="select_url">选择URL</string>
+    <string name="select_url_dialog_title">点击URL进行复制或长按打开</string>
+    <string name="select_all_and_share">分享输出</string>
+    <string name="select_url_no_found">在终端中找不到URL.</string>
+    <string name="select_url_copied_to_clipboard">URL 复制到剪切板</string>
+    <string name="share_transcript_chooser_title">发送文本至:</string>
+		
+    <string name="kill_process">终止进程 (%d)</string>
+    <string name="confirm_kill_process">真的要终止这个会话吗?</string>
+		
+    <string name="session_rename_title">设置会话名称</string>
+    <string name="session_rename_positive_button">设置</string>
+    <string name="session_new_named_title">新建命名会话</string>
+    <string name="session_new_named_positive_button">创建</string>
+		
+    <string name="styling_not_installed">这个Termux:样式附加组件未安装。</string>
+    <string name="styling_install">安装</string>
+		
+    <string name="notification_action_exit">退出</string>
+    <string name="notification_action_wake_lock">获取唤醒锁</string>
+    <string name="notification_action_wake_unlock">解除唤醒锁定</string>
+		
+    <string name="file_received_title">文件保存在 ~/downloads/</string>
+    <string name="file_received_edit_button">编辑</string>
+    <string name="file_received_open_folder_button">打开文件夹</string>
+</resources>		

From 0d48e9a6486f8b1240bc018cd5b1f9152d404f43 Mon Sep 17 00:00:00 2001
From: Ruling <rulingghost@gmail.com>
Date: Wed, 28 Oct 2020 21:48:39 +0800
Subject: [PATCH 2/2] Correct some Chinese Translation

---
 app_main/src/main/res/values-zh/strings.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app_main/src/main/res/values-zh/strings.xml b/app_main/src/main/res/values-zh/strings.xml
index eb431744..4ae9c80f 100644
--- a/app_main/src/main/res/values-zh/strings.xml
+++ b/app_main/src/main/res/values-zh/strings.xml
@@ -8,7 +8,7 @@
     <string name="cancel">取消</string>
     <string name="agree">同意</string>
     <string name="go2">前往</string>
-    <string name="ok">可以</string>
+    <string name="ok">确定</string>
     <string name="clear">清空</string>
 
 
@@ -38,7 +38,7 @@
     <string name="cleaning">正在清除数据.....</string>
     <string name="clearFinish">清除完成，将会重启.....</string>
     <string name="version">版本</string>
-    <string name="device_connect_empty">未发现设备， 下拉可寻找....</string>
+    <string name="device_connect_empty">未发现设备，下拉可寻找....</string>
     <string name="menu_title_newDevice">新设备</string>
     <string name="menu_title_allDevice">已连接</string>
 
@@ -76,8 +76,8 @@
     <string name="tips_pm3_version">如果固件非上述版本，可能会导致无法连接或使用过程有一些异常!</string>
     <string name="command_input">命令输入</string>
     <string name="title_input">标题输入</string>
-    <string name="button_edit">按钮编辑</string>
-    <string name="enter_delete">是否确实要将其删除？</string>
+    <string name="button_edit">编辑按钮</string>
+    <string name="enter_delete">是否确定删除？</string>
     <string name="yes">是</string>
     <string name="no">否</string>
     <string name="btn_add">添加按钮</string>
@@ -97,7 +97,7 @@
     <string name="pm3">PM3</string>
     <string name="title_select_dump_file">请选择需要编辑的DUMP文件!</string>
     <string name="title_dump_save_mode">请选择保存方式!</string>
-    <string name="newFile">新的</string>
+    <string name="newFile">新文件</string>
     <string name="input_err">输入有误!</string>
     <string name="cover">覆盖</string>
     <string name="title_dump_select_cover">选择要覆盖的文件</string>
@@ -106,7 +106,7 @@
     <string name="delete_failed">删除失败:</string>
     <string name="cant_select_not_file">不可以选择非文件!</string>
     <string name="data_err">数据集合异常，请确认您的操作,是否选择了正确的文件之类的!</string>
-    <string name="data_name_dafault">无名数据</string>
+    <string name="data_name_dafault">正常数据</string>
     <string name="title_shared_dump_file">共享选定的Dump文件</string>
     <string name="newName">新名字</string>
     <string name="illegal_filenames">非法的文件名!</string>
@@ -153,8 +153,8 @@
     <string name="app">本APP目录</string>
     <string name="mct">MCT目录</string>
     <string name="format_convert_file_name_input">文件名，不输入或者存在都将会覆盖</string>
-    <string name="format_convert_file_what_fromat">3、转为啥格式</string>
-    <string name="format_convert_to_where">2、保存到哪里</string>
+    <string name="format_convert_file_what_fromat">3、执行转换</string>
+    <string name="format_convert_to_where">2、保存路径</string>
     <string name="format_bin">二进制文件格式</string>
     <string name="format_txt">文本文件格式</string>
     <string name="format_between">它们的区别?</string>