From 46240a903ee4bf63b8b1081cc03701b89d29bcb5 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sun, 19 Jul 2015 11:18:45 -0700
Subject: Import revised translations

---
 app/src/main/res/values-eu/strings.xml     |   3 +
 app/src/main/res/values-zh-rCN/strings.xml | 104 ++++++++++++++++-------------
 2 files changed, 59 insertions(+), 48 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 0a5ab9b..91a7889 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -8,6 +8,7 @@
   <string name="title_host_editor">Editatu ostalaria</string>
   <string name="title_help">Laguntza</string>
   <string name="title_colors">Koloreak</string>
+  <string name="title_color_picker">Aukeratu kolorea</string>
   <string name="resolve_connect">Konektatu</string>
   <string name="resolve_entropy">Bildu entropia</string>
   <string name="menu_insert">Gehitu ostalaria</string>
@@ -75,8 +76,10 @@
   <string name="pref_ui_category">Erabiltzaile-interfazea</string>
   <string name="pref_rotation_title">Biratze modua</string>
   <string name="pref_rotation_summary">Nola aldatu biratzea teklatua bistaratzean/izkutatzean.</string>
+  <string name="pref_titlebarhide_title">Ezkutatu titulu-barra automatikoki</string>
   <string name="pref_fullscreen_title">Pantaila osoa</string>
   <string name="pref_fullscreen_summary">Ezkutatu egoera-barra kontsola erabiltzean</string>
+  <string name="pref_keyboard_category">Teklatua</string>
   <string name="pref_memkeys_title">Gorde gakoak memorian</string>
   <string name="pref_memkeys_summary">Gogoratu desblokeatutako gakoak memorian zerbitzua amaitu arte</string>
   <string name="pref_conn_persist_title">Konexio iraunkorrak</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4420982..35b2ab5 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="app_desc">简洁、强大、开源的SSH客户端</string>
-  <string name="service_desc">维护SSH连接及已装载的公钥</string>
+  <string name="app_desc">简洁、强大、开源的SSH客户端。</string>
+  <string name="service_desc">维护 SSH 连接和已加载的公钥</string>
   <string name="title_hosts_list">主机</string>
   <string name="title_pubkey_list">公钥</string>
   <string name="title_port_forwards_list">端口转发</string>
   <string name="title_host_editor">编辑主机</string>
   <string name="title_help">帮助</string>
   <string name="title_colors">颜色</string>
-  <string name="title_color_picker">选择一种颜色</string>
+  <string name="title_color_picker">选取一种颜色</string>
   <string name="resolve_connect">连接</string>
-  <string name="resolve_entropy">收集杂乱数</string>
+  <string name="resolve_entropy">收集熵</string>
   <string name="menu_insert">添加主机</string>
   <string name="menu_delete">删除主机</string>
   <string name="menu_preferences">设置</string>
   <string name="help_intro">请在下面主题中选择一个以查看更多内容</string>
   <string name="help_about">关于ConnectBot</string>
   <string name="help_keyboard">键盘</string>
-  <string name="pubkey_generate">产生</string>
+  <string name="pubkey_generate">生成</string>
   <string name="pubkey_import">导入</string>
   <string name="pubkey_delete">删除密钥</string>
-  <string name="pubkey_gather_entropy">正在收集用户熵</string>
-  <string name="pubkey_touch_prompt">触摸方框来收集随机数：%1$d％完成</string>
+  <string name="pubkey_gather_entropy">正在收集熵</string>
+  <string name="pubkey_touch_prompt">触摸这个方框来收集随机数：%1$d%% 完成</string>
   <string name="pubkey_touch_hint">请在方框内随机移动手指来生成随机密钥</string>
-  <string name="pubkey_generating">正在产生密钥配对</string>
+  <string name="pubkey_generating">正在生成密钥对...</string>
   <string name="pubkey_copy_private">复制私钥</string>
   <string name="pubkey_copy_public">复制公钥</string>
   <string name="pubkey_list_empty">点击\"菜单\"来创建或者导入密钥对</string>
   <string name="pubkey_unknown_format">未知格式</string>
   <string name="pubkey_change_password">更改密码</string>
-  <string name="pubkey_list_pick">从/sdcard导入</string>
-  <string name="pubkey_import_parse_problem">导入私钥的时候出现问题</string>
+  <string name="pubkey_list_pick">从 /sdcard 选取</string>
+  <string name="pubkey_import_parse_problem">导入的私钥解析出错</string>
   <string name="pubkey_unlock">解锁密钥</string>
-  <string name="pubkey_failed_add">验证失败，\'%1$s\'密钥密码错误</string>
+  <string name="pubkey_failed_add">\'%1$s\' 密钥的密码错误。用户身份验证失败。</string>
   <string name="pubkey_memory_load">载入到内存</string>
   <string name="pubkey_memory_unload">从内存中移除</string>
-  <string name="pubkey_load_on_start">启动时自动载入公钥</string>
+  <string name="pubkey_load_on_start">启动时载入密钥</string>
   <string name="pubkey_confirm_use">使用前确认</string>
   <string name="portforward_list_empty">点击「菜单」来创建端口转发</string>
   <string name="portforward_edit">编辑转发端口</string>
@@ -45,22 +45,22 @@
   <string name="prompt_source_port">源端口：</string>
   <string name="prompt_destination">目标端口：</string>
   <string name="prompt_old_password">旧密码：</string>
-  <string name="prompt_password">新密码:</string>
+  <string name="prompt_password">新密码：</string>
   <string name="prompt_again">确认新密码</string>
   <string name="prompt_type">转发类型</string>
-  <string name="prompt_password_can_be_blank">注意:密码可以为空</string>
+  <string name="prompt_password_can_be_blank">注意：密码可以为空</string>
   <string name="prompt_bits">位数：</string>
   <string name="prompt_pubkey_password">密钥「%1$s」的密码</string>
-  <string name="prompt_allow_agent_to_use_key">允许远程主机使用\'%1$s\'密钥？</string>
-  <string name="host_verification_failure_warning_header">警告：远程主机身份标识已经改变</string>
-  <string name="host_verification_failure_warning">可能某人正在做非善意的事情\n可能有人正在偷听你的会话(中间人攻击)\n但也许仅仅是主密匙(host key)已被更改，你确信如此?</string>
-  <string name="prompt_host_disconnected">主机已经断开。\n是否关闭本次对话？</string>
-  <string name="prompt_continue_connecting">是否要继续连接？</string>
+  <string name="prompt_allow_agent_to_use_key">允许远程主机\n使用密钥 \'%1$s\'？</string>
+  <string name="host_verification_failure_warning_header">警告：远程主机身份标识已经改变！</string>
+  <string name="host_verification_failure_warning">可能有人正在做非善意的事情！\n可能有人正在偷听你的会话(中间人攻击)！\n但也可能是主机密钥正好已被更改。</string>
+  <string name="prompt_host_disconnected">主机已经断开。\n关闭本次会话？</string>
+  <string name="prompt_continue_connecting">你确定要\n继续连接？</string>
   <string name="host_authenticity_warning">主机「%1$s」的验证无法建立</string>
   <string name="host_fingerprint">主机 %1$s 密钥指纹是 %2$s</string>
   <string name="alert_passwords_do_not_match_msg">密码不匹配！</string>
-  <string name="alert_wrong_password_msg">密码错误</string>
-  <string name="alert_key_corrupted_msg">私钥似乎已破坏</string>
+  <string name="alert_wrong_password_msg">密码错误！</string>
+  <string name="alert_key_corrupted_msg">私钥似乎已损坏！</string>
   <string name="alert_sdcard_absent">没有插入SD卡！</string>
   <string name="button_add">添加</string>
   <string name="button_change">修改</string>
@@ -74,8 +74,10 @@
   <string name="pref_scrollback_title">回滚长度</string>
   <string name="pref_scrollback_summary">在内存中为每个控制台保留的回滚缓存长度</string>
   <string name="pref_ui_category">用户界面</string>
-  <string name="pref_rotation_title">循环模式</string>
+  <string name="pref_rotation_title">旋转模式</string>
   <string name="pref_rotation_summary">当键盘打开或关闭时屏幕如何旋转(水平或竖直)</string>
+  <string name="pref_titlebarhide_title">自动隐藏标题栏</string>
+  <string name="pref_titlebarhide_summary">触击控制台显示标题栏和访问菜单</string>
   <string name="pref_fullscreen_title">全屏</string>
   <string name="pref_fullscreen_summary">处于控制台时隐藏状态栏</string>
   <string name="pref_keyboard_category">键盘</string>
@@ -91,8 +93,11 @@
   <string name="pref_conn_persist_summary">切换到后台时强制保持连接</string>
   <string name="pref_keymode_title">目录快捷方式</string>
   <string name="pref_keymode_summary">选择如何使用 Alt 代表 /，Shift 代表 Tab</string>
-  <string name="pref_camera_title">摄像快捷键</string>
-  <string name="pref_camera_summary">选择照相键按下时触发的快捷功能</string>
+  <string name="pref_stickymodifiers_title">粘滞键</string>
+  <string name="pref_stickymodifiers_summary">粘滞键保持有效，直到按下另一个键</string>
+  <string name="only_alt">仅 alt</string>
+  <string name="pref_camera_title">相机按钮快捷键</string>
+  <string name="pref_camera_summary">选择相机按钮按下触发哪个快捷键</string>
   <string name="pref_keepalive_title">保持屏幕唤醒</string>
   <string name="pref_keepalive_summary">终端运行时禁止屏幕休眠</string>
   <string name="pref_wifilock_title">保持WI-FI激活</string>
@@ -103,10 +108,10 @@
   <string name="pref_bell_title">响铃</string>
   <string name="pref_bell_volume_title">铃声音量</string>
   <string name="pref_bell_vibrate_title">响铃时振动</string>
-  <string name="pref_bell_notification_title">背景通知</string>
+  <string name="pref_bell_notification_title">后台通知</string>
   <string name="pref_bell_notification_summary">当终端在后台响铃时发出通知</string>
-  <string name="list_keymode_right">使用右边键盘</string>
-  <string name="list_keymode_left">使用左边键盘</string>
+  <string name="list_keymode_right">使用右边的键</string>
+  <string name="list_keymode_left">使用左边的键</string>
   <string name="list_keymode_none">禁用</string>
   <string name="list_pubkeyids_none">不使用密匙</string>
   <string name="list_pubkeyids_any">使用解锁密匙</string>
@@ -114,15 +119,17 @@
   <string name="hostpref_color_title">颜色类型</string>
   <string name="hostpref_fontsize_title">字型大小 (pt)</string>
   <string name="hostpref_pubkeyid_title">使用公钥验证</string>
-  <string name="hostpref_authagent_title">使用 SSH 认证</string>
+  <string name="hostpref_authagent_title">使用 SSH 认证代理</string>
   <string name="hostpref_postlogin_title">登录后自动运行</string>
   <string name="hostpref_postlogin_summary">登录后在远程服务器上自动运行命令</string>
   <string name="hostpref_compression_title">压缩</string>
   <string name="hostpref_compression_summary">此选项对低速网络会有帮助</string>
   <string name="hostpref_wantsession_title">开始Shell会话</string>
-  <string name="hostpref_wantsession_summary">仅仅对端口转发禁用偏好设置</string>
+  <string name="hostpref_wantsession_summary">仅使用端口转发禁用这个设置</string>
   <string name="hostpref_stayconnected_title">保持连接</string>
   <string name="hostpref_stayconnected_summary">断线重连</string>
+  <string name="hostpref_quickdisconnect_title">连接断开时关闭</string>
+  <string name="hostpref_quickdisconnect_summary">远程连接断开后，立即关闭不提示。</string>
   <string name="hostpref_delkey_title">DEL键</string>
   <string name="hostpref_delkey_summary">按下DEL键时发送给服务器的键值</string>
   <string name="hostpref_encoding_title">编码</string>
@@ -132,25 +139,25 @@
   <string name="hostpref_hostname_title">主机</string>
   <string name="hostpref_port_title">端口</string>
   <string name="bind_never">尚未连接</string>
-  <string name="console_copy_done">已复制%1$d位</string>
+  <string name="console_copy_done">复制了 %1$d 字节到剪贴板</string>
   <string name="console_copy_start">点击拖动\n或使用触摸板\n来选择要复制的区域</string>
   <string name="console_menu_close">关闭</string>
   <string name="console_menu_copy">复制</string>
   <string name="console_menu_paste">粘贴</string>
   <string name="console_menu_portforwards">端口转发</string>
   <string name="console_menu_resize">指定大小</string>
-  <string name="console_menu_urlscan">URL 地址扫描</string>
+  <string name="console_menu_urlscan">URL 扫描</string>
   <string name="button_yes">确认</string>
-  <string name="button_no">取消</string>
+  <string name="button_no">否</string>
   <string name="portforward_local">本地</string>
   <string name="portforward_remote">远端</string>
   <string name="portforward_dynamic">动态套接字(SOCKS)</string>
   <string name="portforward_pos">创建端口转发</string>
   <string name="portforward_done">创建端口转发成功</string>
-  <string name="portforward_problem">创建端口转发失败，检查你选择的端口是否小于1024或该端口已被占用</string>
+  <string name="portforward_problem">创建端口转发失败，可能你选择的端口小于1024或该端口已被占用？</string>
   <string name="portforward_menu_add">添加端口转发</string>
   <string name="hint_userhost">用户名\@主机名</string>
-  <string name="list_format_error">使用%1$s格式</string>
+  <string name="list_format_error">使用格式 \"%1$s\"</string>
   <string name="format_username">用户名</string>
   <string name="format_hostname">主机名</string>
   <string name="format_port">端口</string>
@@ -162,18 +169,18 @@
   <string name="list_host_edit">编辑主机</string>
   <string name="list_host_portforwards">编辑端口转发</string>
   <string name="list_host_delete">删除主机</string>
-  <string name="list_host_empty">使用下面的快速连接框连接主机</string>
+  <string name="list_host_empty">使用下面的快速连接框\n连接主机。</string>
   <string name="list_rotation_default">默认</string>
   <string name="list_rotation_land">强制横屏显示</string>
   <string name="list_rotation_port">强制竖屏显示</string>
   <string name="list_rotation_auto">自动</string>
   <string name="list_camera_ctrlaspace">Ctrl+A 然后 Space</string>
   <string name="list_camera_ctrla">Ctrl+A</string>
-  <string name="list_camera_esc">Esc 键</string>
+  <string name="list_camera_esc">Esc</string>
   <string name="list_camera_esc_a">Esc+A</string>
   <string name="list_camera_none">无</string>
   <string name="list_delkey_backspace">退格键</string>
-  <string name="list_delkey_del">删除</string>
+  <string name="list_delkey_del">删除键</string>
   <string name="delete_message">确定要删除\'%1$s\'吗？</string>
   <string name="delete_pos">是，删除</string>
   <string name="delete_neg">取消</string>
@@ -183,28 +190,29 @@
   <string name="terminal_no_hosts_connected">当前没有连接主机</string>
   <string name="terminal_connecting">正在通过%3$s连接到 %1$s:%2$d</string>
   <string name="terminal_sucess">验证主机 %1$s 键值： %2$s</string>
-  <string name="terminal_failed">主机验证失败</string>
+  <string name="terminal_failed">主机密钥验证失败。</string>
   <string name="terminal_using_s2c_algorithm">服务器到客户端算法：%1$s %2$s</string>
   <string name="terminal_using_c2s_algorithm">客户端到服务器算法：%1$s %2$s</string>
   <string name="terminal_using_algorithm">使用算法：%1$s %2$s</string>
-  <string name="terminal_auth">尝试验证</string>
-  <string name="terminal_auth_pass">尝试进行用户口令认证</string>
-  <string name="terminal_auth_pass_fail">密码验证失败</string>
+  <string name="terminal_kex_algorithm">密钥交换算法: %s</string>
+  <string name="terminal_auth">尝试身份验证</string>
+  <string name="terminal_auth_pass">尝试 \'密码\' 身份验证</string>
+  <string name="terminal_auth_pass_fail">\'密码\' 方式身份验证失败</string>
   <string name="terminal_auth_pubkey_any">尝试使用保存在内存中的公匙进行用户认证</string>
   <string name="terminal_auth_pubkey_invalid">所选公钥失效,请在主机中重新选择</string>
-  <string name="terminal_auth_pubkey_specific">正在以公钥认证方式认证所指定的公钥</string>
-  <string name="terminal_auth_pubkey_fail">公钥%1$s认证失败</string>
-  <string name="terminal_auth_ki">尝试键盘交互式认证</string>
-  <string name="terminal_auth_ki_fail">键盘交互式认证失败</string>
+  <string name="terminal_auth_pubkey_specific">尝试以指定的公钥进行 \'公钥\' 方式身份验证</string>
+  <string name="terminal_auth_pubkey_fail">以密钥 \'%1$s\' 进行 \'公钥\' 方式身份认证失败</string>
+  <string name="terminal_auth_ki">尝试 \'键盘交互式\' 方式身份认证</string>
+  <string name="terminal_auth_ki_fail">\'键盘交互式\' 方式身份认证失败</string>
   <string name="terminal_auth_fail">[该主机不支持用户口令认证或键盘交互式认证]</string>
-  <string name="terminal_no_session">由于主机设定不起动该会话</string>
+  <string name="terminal_no_session">由于主机设置不能起动该会话。</string>
   <string name="terminal_enable_portfoward">启用端口转发：%1$s</string>
   <string name="local_shell_unavailable">失败! 本地Shell在该手机上不可用</string>
-  <string name="notification_text">%1$s 需要你的注意</string>
+  <string name="notification_text">%1$s 需要你关注。</string>
   <string name="no">不</string>
   <string name="with_confirmation">需要确认</string>
   <string name="yes">确定</string>
-  <string name="exceptions_submit_message">ConnectBot上次运行时出现异常, 是否提交报告至ConnectBot开发者?</string>
+  <string name="exceptions_submit_message">ConnectBot 上次运行时出现异常，是否提交报告至 ConnectBot 开发者？</string>
   <string name="menu_colors_reset">重置</string>
   <string name="app_is_running">ConnectBot 正在运行</string>
   <string name="color_red">红色</string>
-- 
cgit v1.2.3