Localized strings for Hongkong(Chinese) and Simplified Chinese

- Removed the password strings - removed teh diffs in about.xml generator Change-Id: I5e01ec7a5496036765ad80fdeb50a93250d7bcf2
author: Axesh R. Ajmera <aajmera@codeaurora.org> 2014-04-09 15:05:59 -0700
committer: WebTech Code Review <code-review@localhost> 2014-04-16 13:08:51 -0700
commit: 6bb57a2f469c47da67bf55bf531e6b52761ac079 (patch)
tree: d6309dda62cd4edd3951a2588b9fecccc9f2f01f
parent: 91e61fd633f166eadb8830819b45fe45b826874c (diff)
download: android_packages_apps_Gello-6bb57a2f469c47da67bf55bf531e6b52761ac079.tar.gz
android_packages_apps_Gello-6bb57a2f469c47da67bf55bf531e6b52761ac079.tar.bz2
android_packages_apps_Gello-6bb57a2f469c47da67bf55bf531e6b52761ac079.zip
13 files changed, 111 insertions, 56 deletions
diff --git a/res/raw-zh-rCN/incognito_mode_start_page.html b/res/raw-zh-rCN/incognito_mode_start_page.html
new file mode 100644
index 00000000..acf3ed83
--- /dev/null
+++ b/res/raw-zh-rCN/incognito_mode_start_page.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!--
+ # Copyright (c) 2014, The Linux Foundation. All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions are
+ # met:
+ #     * Redistributions of source code must retain the above copyright
+ #      notice, this list of conditions and the following disclaimer.
+ #    * Redistributions in binary form must reproduce the above
+ #      copyright notice, this list of conditions and the following
+ #      disclaimer in the documentation and/or other materials provided
+ #      with the distribution.
+ #    * Neither the name of The Linux Foundation nor the names of its
+ #      contributors may be used to endorse or promote products derived
+ #      from this software without specific prior written permission.
+ #
+ # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ # ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ # BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
+    <title>SWE 浏览器隐身模式</title>
+  </head>
+  <body>
+  <p>
+  <p>
+   <strong>您已进入隐身模式。</strong>.
+   <p>在您关闭所有隐身标签页后，您在这些标签页中查看的网页不会在浏览器历史记录、Cookie存储区或搜索记录中留下任何痕迹。只是，您下载的所有文件或创建的书签均会保留下来。</p>
+</body>
+</html>
+
diff --git a/res/raw-zh-rHK/incognito_mode_start_page.html b/res/raw-zh-rHK/incognito_mode_start_page.html
new file mode 100644
index 00000000..b8e4f525
--- /dev/null
+++ b/res/raw-zh-rHK/incognito_mode_start_page.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!--
+ # Copyright (c) 2014, The Linux Foundation. All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions are
+ # met:
+ #     * Redistributions of source code must retain the above copyright
+ #      notice, this list of conditions and the following disclaimer.
+ #    * Redistributions in binary form must reproduce the above
+ #      copyright notice, this list of conditions and the following
+ #      disclaimer in the documentation and/or other materials provided
+ #      with the distribution.
+ #    * Neither the name of The Linux Foundation nor the names of its
+ #      contributors may be used to endorse or promote products derived
+ #      from this software without specific prior written permission.
+ #
+ # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ # ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ # BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<html>
+    <head>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
+        <title>SWE 無痕式網頁</title>
+    </head>
+    <body>
+      <p>
+      <p>
+       <strong>您已啟用無痕瀏覽模式。</strong>.
+       <p> 當您關閉無痕式視窗後，您在此視窗中瀏覽的網頁將不會顯示於瀏覽器記錄或搜尋記錄中，亦不會在裝置上留下任何如 Cookie 等痕跡。不過，您下載的檔案或建立的書籤都會保留下來。</p>
+    </body>
+</html>
+\ No newline at end of file
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 23d25624..0b2d71f2 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -148,11 +148,7 @@
     <string name="ssl_certificate">شهادة الأمان</string>
     <string name="ssl_certificate_is_valid">هذه الشهادة صالحة.</string>
     <string name="pref_memory_monitor"> تمكين مراقب الذاكرة </string>
-    <string name="password_prompt_title">تأكيد</string>
-    <string name="password_prompt_message">هل تريد من المتصفح تذكر كلمة المرور هذه؟</string>
-    <string name="password_prompt_never">مطلقًا</string>
-    <string name="password_prompt_remember">تذكر</string>
-    <string name="password_prompt_not_now">ليس الآن</string>
+
 
   <string-array name="pref_content_plugins_choices">
     <item msgid="6745108155096660725">"تشغيل دومًا"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b92723e8..ec54327c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -148,11 +148,6 @@
     <string name="ssl_certificate">Certificado de seguridad</string>
     <string name="ssl_certificate_is_valid">Este certificado es válido.</string>
     <string name="pref_memory_monitor">Activar Monitor de memoria</string>
-    <string name="password_prompt_title">Confirmar</string>
-    <string name="password_prompt_message">¿Deseas que el navegador recuerde esta contraseña?</string>
-    <string name="password_prompt_never">Nunca</string>
-    <string name="password_prompt_remember">Recordar</string>
-    <string name="password_prompt_not_now">Ahora no</string>
 
 
   <string-array name="pref_content_plugins_choices">
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d3ed91f0..8b53d24c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -148,11 +148,6 @@
     <string name="ssl_certificate">सुरक्षा प्रमाणपत्र</string>
     <string name="ssl_certificate_is_valid">यह प्रमाणपत्र मान्य है.</string>
     <string name="pref_memory_monitor">मेमोरी मॉनीटर सक्षम करें</string>
-    <string name="password_prompt_title">पुष्टि करें</string>
-    <string name="password_prompt_message">क्‍या आप चाहते हैं कि ब्राउज़र यह पासवर्ड याद रखे?</string>
-    <string name="password_prompt_never">कभी नहीं</string>
-    <string name="password_prompt_remember">याद रखें</string>
-    <string name="password_prompt_not_now">अभी नहीं</string>
 
   <string-array name="pref_content_plugins_choices">
     <item msgid="6745108155096660725">"हमेशा चालू"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e8a17e61..f8cc60ce 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -148,11 +148,6 @@
     <string name="ssl_certificate">Сертификат безопасности</string>
     <string name="ssl_certificate_is_valid">Данный сертификат действителен.</string>
     <string name="pref_memory_monitor">Включить контроль памяти</string>
-    <string name="password_prompt_title">Подтвердить</string>
-    <string name="password_prompt_message">Хотите, чтобы браузер запомнил этот пароль?</string>
-    <string name="password_prompt_never">Никогда</string>
-    <string name="password_prompt_remember">Запомнить</string>
-    <string name="password_prompt_not_now">Не сейчас</string>
 
   <string-array name="pref_content_plugins_choices">
     <item msgid="6745108155096660725">"Да"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 745d87e2..0a419df9 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -148,11 +148,6 @@
     <string name="ssl_certificate">ใบรับรองความปลอดภัย</string>
     <string name="ssl_certificate_is_valid">ใบรับรองนี้ถูกต้อง</string>
     <string name="pref_memory_monitor">เปิดใช้งานอุปกรณ์ตรวจสอบหน่วยความจำ</string>
-    <string name="password_prompt_title">ยืนยัน</string>
-    <string name="password_prompt_message">คุณต้องการให้เบราเซอร์จดจำรหัสผ่านนี้หรือไม่</string>
-    <string name="password_prompt_never">ไม่ใช้</string>
-    <string name="password_prompt_remember">จดจำ</string>
-    <string name="password_prompt_not_now">ไม่ใช่ตอนนี้</string>
 
   <string-array name="pref_content_plugins_choices">
     <item msgid="6745108155096660725">"เปิดใช้เสมอ"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 96188c13..96589a1b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -148,11 +148,7 @@
     <string name="ssl_certificate">Certificate ng seguridad</string>
     <string name="ssl_certificate_is_valid">May bisa ang certificate na ito.</string>
     <string name="pref_memory_monitor">Paganahin ang Memory Monitor</string>
-    <string name="password_prompt_title">Kumpirmahin</string>
-    <string name="password_prompt_message">Gusto mo bang tandaan ng browser ang password na ito?</string>
-    <string name="password_prompt_never">Huwag Kailanman</string>
-    <string name="password_prompt_remember">Tandaan</string>
-    <string name="password_prompt_not_now">Hindi ngayon</string>
+
 
   <string-array name="pref_content_plugins_choices">
     <item msgid="6745108155096660725">"Palaging naka-on"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d5a2e6f6..f0524655 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -148,11 +148,6 @@
     <string name="ssl_certificate">Güvenlik sertifikası</string>
     <string name="ssl_certificate_is_valid">Bu sertifika geçerli.</string>
     <string name="pref_memory_monitor">Bellek Monitörünü Etkinleştir</string>
-    <string name="password_prompt_title">Onayla</string>
-    <string name="password_prompt_message">Tarayıcının şifrenizi hatırlamasını istiyor musunuz?</string>
-    <string name="password_prompt_never">Hiçbir Zaman</string>
-    <string name="password_prompt_remember">Hatırla</string>
-    <string name="password_prompt_not_now">Şmd dğl</string>
 
   <string-array name="pref_content_plugins_choices">
     <item msgid="6745108155096660725">"Her zaman açık"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 38ae6f5c..88a7cd8d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -148,11 +148,6 @@
     <string name="ssl_certificate">Chứng chỉ bảo mật</string>
     <string name="ssl_certificate_is_valid">Chứng chỉ này hợp lệ.</string>
     <string name="pref_memory_monitor">Bật theo dõi bộ nhớ</string>
-    <string name="password_prompt_title">Xác nhận</string>
-    <string name="password_prompt_message">Bạn có muốn trình duyệt ghi nhớ mật khẩu này không?</string>
-    <string name="password_prompt_never">Không bao giờ</string>
-    <string name="password_prompt_remember">Ghi nhớ</string>
-    <string name="password_prompt_not_now">Không phải bây giờ</string>
 
   <string-array name="pref_content_plugins_choices">
     <item msgid="6745108155096660725">"Luôn bật"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 103643a0..4df016e4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -135,6 +135,20 @@
     <string name="pref_content_javascript" msgid="4570972030299516843">"启用 JavaScript"</string>
     <string name="pref_content_open_in_background" msgid="824123779725118663">"在后方打开"</string>
     <string name="pref_content_plugins" msgid="7231944644794301582">"启用插件"</string>
+
+    <!-- Custom Translations -->
+    <string name="browser_tab_crash_snap">"喔唷，崩溃啦！"</string>
+    <string name="browser_tab_crash_reload">"重新加载"</string>
+    <string name="browser_tab_crash_message">"显示此网页时出现了某些错误。要继续，请按下“重新加载”或进入另一页。"</string>
+    <string name="find_on_page">"在网页上查找"</string>
+    <string name="ssl_certificate">"安全证书"</string>
+    <string name="ssl_certificate_is_valid">"该证书有效。"</string>
+    <string name="pref_memory_monitor">"开启内存监测"</string>
+    <string name="version">"版本"</string>
+    <string name="max_url_character_limit_msg">"抱歉，您输入的网址过长"</string>
+
+
+
   <string-array name="pref_content_plugins_choices">
     <item msgid="6745108155096660725">"始终启用（打开）"</item>
     <item msgid="2484126708670016519">"在需要时打开"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index b8678a7b..bcdc3d8a 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -135,6 +135,17 @@
     <string name="pref_content_javascript" msgid="4570972030299516843">"啟用 JavaScript"</string>
     <string name="pref_content_open_in_background" msgid="824123779725118663">"在背景中開啟"</string>
     <string name="pref_content_plugins" msgid="7231944644794301582">"啟用外掛程式"</string>
+
+    <!-- Custom Translations -->
+    <string name="browser_tab_crash_snap">糟糕，突然中斷！</string>
+    <string name="browser_tab_crash_reload">重新載入</string>
+    <string name="browser_tab_crash_message">顯示網頁時發生未預期的錯誤。請重新載入或前往其他網頁。</string>
+    <string name="find_on_page">在網頁上尋找</string>
+    <string name="ssl_certificate">安全性憑證</string>
+    <string name="ssl_certificate_is_valid">此憑證有效。</string>
+    <string name="pref_memory_monitor">啟用記憶體監察器</string>
+
+
   <string-array name="pref_content_plugins_choices">
     <item msgid="6745108155096660725">"永遠開啟"</item>
     <item msgid="2484126708670016519">"隨選"</item>
diff --git a/tools/generate_about.sh b/tools/generate_about.sh
index c44072a0..1b735660 100755
--- a/tools/generate_about.sh
+++ b/tools/generate_about.sh
@@ -136,21 +136,6 @@ do
         warning "using version ${VERSION}.. merge-base:\"${MERGE_BASE}\" branch: \"${BRANCH}\""
     fi
 
-    if (( ${ABOUT} ))
-    then
-        # collect diffs (just in case.  this will normally be NULL)
-        DIFFS=$(gclient recurse git diff)
-        DIFFS=${DIFFS//&/&amp;}
-        DIFFS=${DIFFS//</&lt;}
-        DIFFS=${DIFFS//$'\x5c'/$'\x5c'$'\x5c'} # \ -> \\
-        DIFFS=${DIFFS//$'\x27'/$'\x5c'$'\x27'} # ' -> \'
-        DIFFS=${DIFFS//$'\n'/$'\n'\\n}         # newline to newline\n
-        if [[ -n ${DIFFS} ]]
-        then
-            DIFFS="Diffs:\n<tt><font size=\"4\">${DIFFS}</font></tt>"
-            warning "including diffs in about box" >&2
-        fi
-    fi
     popd >/dev/null || error 1 "popd from $CHROME_SRC failed?"
     break
 done
@@ -176,7 +161,6 @@ Built: ${DATE}\n
 Host: ${HOSTNAME}\n
 User: ${USER}\n
 Hash: ${HASH} (${BRANCH})\n
-${DIFFS}
 </string>
 </resources>
 " > "${ABOUTFILE}" || error 1 "could not write to ${ABOUTFILE}"
author	Axesh R. Ajmera <aajmera@codeaurora.org>	2014-04-09 15:05:59 -0700
committer	WebTech Code Review <code-review@localhost>	2014-04-16 13:08:51 -0700
commit	6bb57a2f469c47da67bf55bf531e6b52761ac079 (patch)
tree	d6309dda62cd4edd3951a2588b9fecccc9f2f01f
parent	91e61fd633f166eadb8830819b45fe45b826874c (diff)
download	android_packages_apps_Gello-6bb57a2f469c47da67bf55bf531e6b52761ac079.tar.gz android_packages_apps_Gello-6bb57a2f469c47da67bf55bf531e6b52761ac079.tar.bz2 android_packages_apps_Gello-6bb57a2f469c47da67bf55bf531e6b52761ac079.zip