Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97996874 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Fix i18n zhCN patch as it was causing build issues

parent 0f164e33
Loading
Loading
Loading
Loading
+13 −14
Original line number Diff line number Diff line
From 789602b31dd70a08a2fcff4dd40156a8001f8340 Mon Sep 17 00:00:00 2001
From c4eac2761e933ef3de7a305b650662f7876aa9a5 Mon Sep 17 00:00:00 2001
From: mars <gzhqyz@gmail.com>
Date: Sun, 2 Aug 2020 00:37:49 +0800
Subject: Update i18n zh_CN support
@@ -8,17 +8,17 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com>
---
 .../resources/generated_resources_zh-CN.xtb   |  4 +-
 .../resources/google_chrome_strings_zh-CN.xtb |  3 +-
 .../android_chrome_strings_zh-CN.xtb          | 72 ++++++++++++++++++-
 .../android_chrome_strings_zh-CN.xtb          | 71 ++++++++++++++++++-
 .../translations/browser_ui_strings_zh-CN.xtb | 26 ++++++-
 .../strings/components_strings_zh-CN.xtb      | 31 +++++++-
 .../translations/android_ui_strings_zh-CN.xtb |  3 +-
 6 files changed, 133 insertions(+), 6 deletions(-)
 6 files changed, 132 insertions(+), 6 deletions(-)

diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb
index 6fd45a50e687e..e8246b0c8cdeb 100644
index 3b4d0a79f1a2d..3e39c88840dc4 100644
--- a/chrome/app/resources/generated_resources_zh-CN.xtb
+++ b/chrome/app/resources/generated_resources_zh-CN.xtb
@@ -12113,4 +12113,6 @@
@@ -12186,4 +12186,6 @@
 <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="998347228911661591">同步标签页分组</translation>
 <translation id="998747458861718449">检查(&amp;N)</translation>
@@ -28,10 +28,10 @@ index 6fd45a50e687e..e8246b0c8cdeb 100644
+<translation id="6262611605884902060">配置广告拦截和过滤规则地址</translation>
+</translationbundle>
diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/resources/google_chrome_strings_zh-CN.xtb
index 8eb0c6cd3dd9e..75e4525e959ed 100644
index af6bdaba0292f..a2b057d57ea1b 100644
--- a/chrome/app/resources/google_chrome_strings_zh-CN.xtb
+++ b/chrome/app/resources/google_chrome_strings_zh-CN.xtb
@@ -755,4 +755,5 @@
@@ -778,4 +778,5 @@
 <translation id="983803489796659991">更新服务器没有应用的任何哈希数据,因此安装失败。</translation>
 <translation id="989369509083708165">Google Chrome 是您的默认浏览器</translation>
 <translation id="989816563149873169"><ph name="SHORTCUT" /> 可用于切换 Chrome 个人资料</translation>
@@ -40,10 +40,10 @@ index 8eb0c6cd3dd9e..75e4525e959ed 100644
+<translation id="9090881409075599658">关于 Bromite</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
index 6a8d845ebfb9e..6893ac8715563 100644
index 9b4560d70c050..513b5502fbc71 100644
--- 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
@@ -1988,4 +1988,74 @@
@@ -1999,4 +1999,73 @@
 <translation id="992745192656291733"><ph name="TAB_COUNT" /> 个标签页</translation>
 <translation id="996149300115483134">动态卡片上的菜单已关闭</translation>
 <translation id="99907655649633293"><ph name="TAB_TITLE" />,无痕式标签页</translation>
@@ -118,13 +118,12 @@ index 6a8d845ebfb9e..6893ac8715563 100644
+<translation id="1658834457013045127">永久保存</translation>
+<translation id="397719798144576362">导航历史记录的保存天数</translation>
+<translation id="6792382002445853728">移动工具栏到底部</translation>
+<translation id="5494920125229734069">全选</translation>
+</translationbundle>
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
index bfe6052be31b1..c15281d734c1d 100644
index c8bf8be048adc..51ab373fa0349 100644
--- 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
@@ -755,4 +755,28 @@
@@ -762,4 +762,28 @@
 <translation id="961930410699694996">这次可以使用位置信息</translation>
 <translation id="967624055006145463">已存储的数据</translation>
 <translation id="969975166333045662">禁止网站使用 V8 优化工具。</translation>
@@ -156,10 +155,10 @@ index bfe6052be31b1..c15281d734c1d 100644
+<translation id="8431607486333903291">WebRTC</translation>
+</translationbundle>
diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb
index d0e674d4b8998..cb2f911457da4 100644
index ea77c36d61a00..b08f768436cf9 100644
--- a/components/strings/components_strings_zh-CN.xtb
+++ b/components/strings/components_strings_zh-CN.xtb
@@ -5143,4 +5143,33 @@
@@ -5193,4 +5193,33 @@
 <translation id="995755448277384931">添加 IBAN</translation>
 <translation id="995782501881226248">YouTube</translation>
 <translation id="997986563973421916">来自 Google Pay</translation>