From 718c152a6a63a20c5a49f32f6f0884e32848f4e9 Mon Sep 17 00:00:00 2001
From: pacien
Date: Wed, 22 Aug 2018 22:44:53 +0200
Subject: Re-organise string resources

---
 app/src/main/res/values-zh-rCN/strings.xml | 68 ++++++++++++------------------
 1 file changed, 27 insertions(+), 41 deletions(-)

(limited to 'app/src/main/res/values-zh-rCN')

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 34039ef..f6e1eda 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -20,32 +20,22 @@
 -->
 
 <resources>
-	<string name="app_name">Tinc App</string>
-	<string name="app_label">Tinc</string>
-	<string name="app_short_desc">tinc mesh VPN 守护进程的 Android 绑定和用户界面。</string>
-	<string name="app_copyright">版权所有 © 2017–2018 Pacien TRAN-GIRARD。</string> <!-- TODO: add "and contributors" -->
-	<string name="app_license">软件根据 GNU 通用公共许可证第3版的条款进行分发。</string>
-	<string name="app_website_url">https://tincapp.pacien.org</string>
-	<string name="app_doc_url_format">https://tincapp.pacien.org/doc.html#%1$s</string>
-
-	<string name="info_version_format">应用程序版本 %1$s（%2$s build）</string>
-	<string name="info_running_on_format">于 Android %1$s %2$s 上运行</string>
-	<string name="info_supported_abis_format">设备 ABI：%1$s</string>
-
-	<string name="menu_about">关于此应用</string>
-	<string name="menu_configure">配置</string>
-	<string name="menu_disconnect">断开连接</string>
-
+	<string name="about_app_short_desc">tinc mesh VPN 守护进程的 Android 绑定和用户界面。</string>
+	<string name="about_app_license">软件根据 GNU 通用公共许可证第3版的条款进行分发。</string>
+	<string name="about_app_version_format">应用程序版本 %1$s（%2$s build）</string>
+	<string name="about_app_running_on_format">于 Android %1$s %2$s 上运行</string>
+	<string name="about_app_supported_abis_format">设备 ABI：%1$s</string>
+	<string name="about_app_menu_about">关于此应用</string>
+	<string name="start_activity_menu_configure">配置</string>
+	<string name="status_activity_menu_disconnect">断开连接</string>
 	<string name="configure_tools_generate_config_net_name_hint">Tinc 网络名称</string>
 	<string name="configure_tools_generate_config_node_name_hint">此节点名称</string>
 	<string name="configure_tools_join_network_field_invitation_url_hint">邀请 URL</string>
 	<string name="configure_tools_private_key_encryption_current_passphrase">当前密码\n（没有则为空）</string>
 	<string name="configure_tools_private_key_encryption_new_passphrase">新密码\n（空白以解密）</string>
 	<string name="configure_tools_generate_config_optional_passphrase_hint">密码（可选）</string>
-	<string name="field_passphrase">密码</string>
-
+	<string name="decrypt_key_modal_field_passphrase">密码</string>
 	<string name="start_network_list_title">连接到网络</string>
-	<string name="title_request_vpn_permissions">请求 VPN 权限</string>
 	<string name="configure_activity_title_path_info">路径信息</string>
 	<string name="status_node_info_dialog_title">节点信息</string>
 	<string name="configure_activity_title_tools">工具</string>
@@ -62,39 +52,35 @@
 	<string name="status_network_info_disallowed_applications_label">不允许的应用程序</string>
 	<string name="status_network_info_allow_bypass_label">允许旁路</string>
 	<string name="status_activity_title_node_list">节点</string>
-	<string name="title_error">错误</string>
+	<string name="generic_title_error">错误</string>
 	<string name="configure_tools_generate_config_title">新建网络</string>
 	<string name="configure_tools_join_network_title">加入网络</string>
-	<string name="title_unable_to_start_tinc">无法启动 tinc</string>
+	<string name="notification_error_title_unable_to_start_tinc">无法启动 tinc</string>
 	<string name="configure_tools_private_keys_encryption_title">私钥加密</string>
-	<string name="title_unlock_private_keys">解锁 tinc 私钥</string>
-
-	<string name="action_close">关闭</string>
-	<string name="action_cancel">取消</string>
-	<string name="action_open_project_website">项目网站</string>
+	<string name="decrypt_key_modal_title">解锁 tinc 私钥</string>
+	<string name="generic_action_close">关闭</string>
+	<string name="generic_action_cancel">取消</string>
+	<string name="about_app_open_project_website">项目网站</string>
 	<string name="configure_tools_action_generate_node_configuration_and_keys">生成节点配置和密钥</string>
 	<string name="configure_tools_action_join_network_via_invitation_url">通过邀请 URL 加入网络</string>
 	<string name="configure_tools_generate_config_action">创建</string>
 	<string name="configure_tools_join_network_action">加入</string>
-	<string name="action_open_manual">打开手册</string>
+	<string name="notification_error_action_open_manual">打开手册</string>
 	<string name="configure_tools_join_network_action_scan_qr_code_action">扫描 QR 码</string>
-	<string name="action_install">安装</string>
-	<string name="action_unlock">解锁</string>
-	<string name="configure_tools_private_keys_encryption_action">应用</string>
+	<string name="decrypt_key_modal_action_unlock">解锁</string>
+	<string name="generic_action_apply">应用</string>
 	<string name="configure_tools_action_encrypt_decrypt_private_keys">加密或解密私钥</string>
-
 	<string name="start_network_list_empty_none_found">未找到网络配置。</string>
 	<string name="configure_tools_generate_config_generating">生成节点配置…</string>
 	<string name="configure_tools_join_network_joining">加入网络…</string>
-	<string name="message_network_configuration_written">网络配置写入成功。</string>
-	<string name="message_no_network_name_provided">没有提供网络名称。</string>
-	<string name="message_no_configuration_for_network_format">没有找到网络“%1$s”的配置。</string>
-	<string name="message_network_config_not_found_format">在“%1$s”找不到网络配置文件。</string>
-	<string name="message_network_config_invalid_format">network.conf 中的网络配置无效：\n%1$s</string>
+	<string name="configure_tools_message_network_configuration_written">网络配置写入成功。</string>
+	<string name="notification_error_message_no_network_name_provided">没有提供网络名称。</string>
+	<string name="notification_error_message_no_configuration_for_network_format">没有找到网络“%1$s”的配置。</string>
+	<string name="notification_error_message_network_config_not_found_format">在“%1$s”找不到网络配置文件。</string>
+	<string name="notification_error_message_network_config_invalid_format">network.conf 中的网络配置无效：\n%1$s</string>
 	<string name="configure_tools_private_keys_encryption_encrypting">加密/解密私钥</string>
-	<string name="message_could_not_decrypt_private_keys_format">无法解密私钥：\n%1$s</string>
-
-	<string name="status_network_info_none_value">无</string>
-	<string name="status_network_info_yes_value">是</string>
-	<string name="status_network_info_no_value">否</string>
+	<string name="notification_error_message_could_not_decrypt_private_keys_format">无法解密私钥：\n%1$s</string>
+	<string name="generic_yes">是</string>
+	<string name="generic_none">无</string>
+	<string name="generic_no">否</string>
 </resources>
-- 
cgit v1.2.3