Merge pull request #1000 from zhmars/translation

Update zh_CN translations

build/patches/Update-i18n-zh_CN-support.patch

@@ -3,16 +3,16 @@ Date: Sun, 2 Aug 2020 00:37:49 +0800
 Subject: Update i18n zh_CN support
 
 ---
- .../resources/generated_resources_zh-CN.xtb   | 15 ++++++++-
+ .../resources/generated_resources_zh-CN.xtb   |  4 ++-
  .../android_chrome_strings_zh-CN.xtb          | 33 ++++++++++++++++++-
- .../translations/browser_ui_strings_zh-CN.xtb |  6 +++-
+ .../translations/browser_ui_strings_zh-CN.xtb | 15 ++++++++-
  .../strings/components_strings_zh-CN.xtb      |  5 ++-
- 4 files changed, 55 insertions(+), 4 deletions(-)
+ 4 files changed, 53 insertions(+), 4 deletions(-)
 
 diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb
 --- a/chrome/app/resources/generated_resources_zh-CN.xtb
 +++ b/chrome/app/resources/generated_resources_zh-CN.xtb
-@@ -7278,4 +7278,17 @@
+@@ -7278,4 +7278,6 @@
  <translation id="996250603853062861">正在建立安全连接...</translation>
  <translation id="99731366405731005">您需要开启 <ph name="LINK1_BEGIN" />Chrome 同步<ph name="LINK1_END" />才能使用 Wi-Fi 同步功能。<ph name="LINK2_BEGIN" />了解详情<ph name="LINK2_END" /></translation>
  <translation id="998747458861718449">检查(&amp;N)</translation>
@@ -20,17 +20,6 @@ diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/res
 \ No newline at end of file
 +<translation id="2243924551662516171">广告拦截</translation>
 +<translation id="6262611605884902060">配置广告拦截和过滤规则地址</translation>
-+<translation id="4128772811514553459">当前版本</translation>
-+<translation id="3183791262245353262">上次检查</translation>
-+<translation id="3829148178381366015">检查间隔</translation>
-+<translation id="7496192982082800780">天</translation>
-+<translation id="487011861564465960">现在检查</translation>
-+<translation id="8685080712879570595">正在检查过滤规则更新</translation>
-+<translation id="5570660995088317375">正在下载新的过滤规则...</translation>
-+<translation id="8097433792594933465">新过滤规则已成功下载</translation>
-+<translation id="4546446702269617072">正在检查，请稍候...</translation>
-+<translation id="970613514743663741">过滤规则已更新</translation>
-+<translation id="2115549246061017755">过滤规则下载出错</translation>
 +</translationbundle>
 diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb
 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb
@@ -45,13 +34,13 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 +<translation id="6897140037006041989">用户代理</translation>
 +<translation id="2849027590920350852">自定义用户代理</translation>
 +<translation id="3897568092228521097">通过菜单切换当前行为</translation>
-+<translation id="4351297939101834142">应用到所有标签页（永久）</translation>
++<translation id="4351297939101834142">应用到所有标签页（粘滞模式）</translation>
 +<translation id="7383399899297848034">仅应用到当前标签页</translation>
 +<translation id="8920209750879608387">自定义</translation>
 +<translation id="3518039828215318352">默认</translation>
-+<translation id="221247012215431408">请输入一个合法的用户代理</translation>
-+<translation id="3414581552405433519">移动版网站用户代理</translation>
-+<translation id="560430187119032030">桌面版网站用户代理</translation>
++<translation id="221247012215431408">输入自定义用户代理</translation>
++<translation id="3414581552405433519">移动版网站</translation>
++<translation id="560430187119032030">桌面版网站</translation>
 +<translation id="5926902521522105785">启用 Viewport 元标签解析</translation>
 +<translation id="7889537574758531583">无痕式标签页启用历史记录</translation>
 +<translation id="5713583121562162330">无痕模式下仍保存历史记录</translation>
@@ -66,7 +55,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 +<translation id="8189997785233370573">访问帮助页面</translation>
 +<translation id="9148058034647219655">退出</translation>
 +<translation id="8082300724182262861">允许自定义标签页意图</translation>
-+<translation id="3872079764041807613">允许应用打开自定义标签页意图，类似 WebView。</translation>
++<translation id="3872079764041807613">允许应用打开自定义标签页意图，类似 WebView</translation>
 +<translation id="5334844597069022743">查看源代码</translation>
 +<translation id="6199737228675124545">以平板模式打开 Bromite</translation>
 +<translation id="8538054130673254553">强制使用平板模式</translation>
@@ -76,7 +65,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin
 diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb
 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb
 +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb
-@@ -307,4 +307,8 @@
+@@ -307,4 +307,17 @@
  <translation id="913657688200966289">在 <ph name="BEGIN_LINK" />Android 设置<ph name="END_LINK" />中为 <ph name="APP_NAME" /> 开启这些权限。</translation>
  <translation id="965817943346481315">屏蔽会展示侵扰性或误导性广告的网站（推荐）</translation>
  <translation id="967624055006145463">已存储的数据</translation>
@@ -86,6 +75,15 @@ diff --git a/components/browser_ui/strings/android/translations/browser_ui_strin
 +<translation id="7837721118676387834">允许特定网站自动播放静音的视频。</translation>
 +<translation id="7445411102860286510">允许网站自动播放静音的视频（推荐）</translation>
 +<translation id="7790128239055164249">时区</translation>
++<translation id="8267804633369439819">使用自定义、随机或系统时区覆盖默认设置</translation>
++<translation id="6372205287993939830">无（系统时区）</translation>
++<translation id="7234539422479817884">随机</translation>
++<translation id="1929966500797423442">系统</translation>
++<translation id="7576277102873242923">自定义</translation>
++<translation id="4172943134336973110">自定义时区（默认为 UTC）</translation>
++<translation id="6417992177946378347">随机（每个页面）</translation>
++<translation id="7031009175502351997">选择时区...</translation>
++<translation id="7755920346053173182">选择时区</translation>
 +</translationbundle>
 diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb
 --- a/components/strings/components_strings_zh-CN.xtb