From 436c2130d231e6e03670a8a1585bd9ccda17e9a8 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <anthonyrestaino11@gmail.com>
Date: Wed, 31 Dec 2014 11:57:45 -0500
Subject: [PATCH] Merging Simplified and Traditional Chinese translations from
 @ageback master

---
 res/values-zh-rCN/strings.xml | 75 +++++++++++++++++++++++++++++++----
 res/values-zh-rTW/strings.xml |  1 +
 2 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 65e2ca9..aba15d8 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,6 +16,7 @@
     <string name="settings">浏览器设置</string>
     <string name="location">允许站点访问地理位置</string>
     <string name="password">保存密码</string>
+    <string name="keep_last_tab">不关闭最后一个标签</string>
     <string name="agent">User Agent</string>
     <string name="history">清空历史记录</string>
     <string name="email">邮件开发者</string>
@@ -60,9 +61,9 @@
     <string name="action_open">打开</string>
     <string name="dialog_link">您希望对此链接进行什么操作？</string>
     <string name="dialog_title_share">分享此页面</string>
-    <string name="dialog_bookmark">What would you like to do with this bookmark?</string>
+    <string name="dialog_bookmark">请问您要如何处理此书签？</string>
     <string name="action_delete">删除</string>
-    <string name="action_blank">Blank Page</string>
+    <string name="action_blank">空白页</string>
     <string name="agent_default">默认 UA</string>
     <string name="agent_desktop">桌面访问</string>
     <string name="agent_mobile">移动设备</string>
@@ -73,8 +74,7 @@
     <string name="action_cancel">取消</string>
     <string name="title_warning">警告</string>
     <string name="dialog_adobe_dead">"非常抱歉，Google 对此做了一些更改导致 Adobe Flash 无法支持 Android 4.4 以及更高版本。"</string>
-    <string name="dialog_adobe_not_installed">"未检测到您的设备中安装了 Adobe Flash Player，
-请先安装 Adobe  Flash Player 后再启用此选项。"</string>
+    <string name="dialog_adobe_not_installed">"未检测到您的设备中安装了 Adobe Flash Player，请先安装 Adobe  Flash Player 后再启用此选项。"</string>
     <string name="dialog_adobe_unsupported">Adobe Flash 无法正常支持 Android 4.2 以及更高版本并且可能导致浏览器崩溃，若您启用后出现浏览器崩溃的问题请勿对此问题进行反馈。</string>
     <string name="title_user_agent">User Agent</string>
     <string name="title_download_location">下载目录</string>
@@ -95,7 +95,7 @@
     <string name="size_smallest">最小</string>
     <string name="title_error">错误</string>
     <string name="dialog_import_error">暂未检测到任何可导入书签的浏览器</string>
-    <string name="hint_title">Title</string>
+    <string name="hint_title">标题</string>
     <string name="hint_url">URL</string>
     <string name="title_edit_bookmark">编辑书签</string>
     <string name="action_edit">编辑</string>
@@ -110,6 +110,67 @@
     <string name="download_no_sdcard_dlg_msg">为正常下载此文件需要 USB 存储设备。</string>
     <string name="download_sdcard_busy_dlg_title">USB 存储不可用</string>
     <string name="download_sdcard_busy_dlg_msg">USB 存储设备目前正忙，为确保正常下载此文件请在通知栏中确认关闭 USB 大容量存储。</string>
-    <string name="folder_default">默认 UA</string>
-    <string name="folder_custom">自定义 UA</string>
+    <string name="incognito_cookies">在隐身模式中启用 Cookies</string>
+    <string name="title_flash">Adobe Flash</string>
+    <string name="action_manual">手工</string>
+    <string name="action_auto">自动</string>
+    <string name="action_follow_me">联系我</string>
+    <string name="url_twitter">twitter.com/ACRDevelopment</string>
+    <string name="clear_cache">清除缓存</string>
+    <string name="message_cache_cleared">缓存已清除</string>
+    <string name="message_import">书签导入成功</string>
+    <string name="message_clear_history">历史已清除</string>
+    <string name="message_cookies_cleared">Cookies 已清除</string>
+    <string name="max_tabs">达到最大标签数</string>
+    <string name="message_text_copied">文本已复制到剪贴板</string>
+    <string name="message_link_copied">链接已复制到剪贴板</string>
+    <string name="custom_url">自定义 URL</string>
+    <string name="message_blocked_local">本地文件已被阻止加载</string>
+    <string name="licenses">开源许可</string>
+    <string name="suggestion">搜索目标</string>
+    <string name="block_ads">拦截广告</string>
+    <string name="message_untrusted_certificate">该网站的证书不被信任。是否仍要继续？</string>
+    <string name="title_form_resubmission">重新提交表单</string>
+    <string name="message_form_resubmission">你想重新发送数据吗？</string>
+    <string name="message_location">\n你想使用你的位置吗？</string>
+    <string name="action_allow">允许</string>
+    <string name="action_dont_allow">不允许</string>
+    <string name="title_sign_in">登录</string>
+    <string name="hint_username">用户名</string>
+    <string name="hint_password">密码</string>
+    <string name="google_suggestions">搜索建议</string>
+    <string name="powered_by_google">由 Google 提供劫持</string>
+    <string name="title_adblock">广告拦截</string>
+    <string name="message_adblock">广告拦截现在只能在付费版的浏览器 - Lightning Browser+ 中使用。你可以在 Google Play 中下载它。</string>
+    <string name="enable_orbot">启用 Orbot</string>
+    <string name="use_tor_prompt">看起来你已经安装了 Orbot. 你想要使用 Tor 吗？</string>
+    <string name="install_orbot">请安装 Orbot 以便通过 Tor 全使用代理。</string>
+    <string name="yes">是</string>
+    <string name="no">否</string>
+    <string name="clear_cookies_exit">退出时清除 cookies</string>
+    <string name="clear_history_exit">退出时清除历史</string>
+    <string name="folder_default">默认</string>
+    <string name="folder_custom">自定义</string>
+    <string name="untitled">未标题的</string>
+    <string name="mpl_license">Mozilla Public License v. 2.0</string>
+    <string name="freeware">免费软件</string>
+    <string name="android_open_source_project">Android 开源项目</string>
+    <string name="hphosts_ad_server_list">hpHosts 广告服务器列表</string>
+    <string name="deleted_tab">重新打开老标签</string>
+    <string name="rendering_mode">渲染模式</string>
+    <string name="name_inverted">反转</string>
+    <string name="name_grayscale">灰度</string>
+    <string name="name_inverted_grayscale">反转灰度</string>
+    <string name="name_normal">普通</string>
+    <string name="sync_history">与 Google 同步历史</string>
+    <string name="title_file_chooser">文件选择器</string>
+    <string name="library_netcipher">NetCipher</string>
+    <string name="license_gnu">GNU Lesser General Public License</string>
+    <string name="export_bookmarks">导出书签到备份文件</string>
+    <string name="import_backup">从备份文件导入书签</string>
+    <string name="bookmark_export_path">书签已导出到</string>
+    <string name="bookmark_settings">书签设置</string>
+    <string name="import_bookmark_error">无法从文件导入书签</string>
+    <string name="title_chooser">选择一个文件</string>
+    <string name="exit">退出</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 439e4d6..7456d14 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -16,6 +16,7 @@
     <string name="settings">設定</string>
     <string name="location">存取地理資訊</string>
     <string name="password">儲存密碼</string>
+    <string name="keep_last_tab">不關閉最後一個標籤</string>
     <string name="agent">User Agent</string>
     <string name="history">清除記錄</string>
     <string name="email">Email 給我</string>