AI 143712: am: CL 143685 am: CL 143547 Import revised translations.

  Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143712

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 92f30c4..6d029ec 100644 (file)
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -498,6 +498,10 @@
     <string name="copyright_title">"Autorská práva"</string>
     <string name="license_title">"Licence"</string>
     <string name="terms_title">"Smluvní podmínky"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Licence open source"</string>
     <string name="settings_license_activity_unavailable">"Při načítání licencí došlo k chybě."</string>
     <string name="settings_license_activity_loading">"Načítání..."</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 39e6b33..c9267b9 100644 (file)
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -498,6 +498,10 @@
     <string name="copyright_title">"Urheberrecht"</string>
     <string name="license_title">"Lizenz"</string>
     <string name="terms_title">"Nutzungsbedingungen"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Open Source-Lizenzen"</string>
     <string name="settings_license_activity_unavailable">"Beim Laden der Lizenzen ist ein Problem aufgetreten."</string>
     <string name="settings_license_activity_loading">"Wird geladen..."</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index cc0f857..e4396f2 100644 (file)
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -498,6 +498,10 @@
     <string name="copyright_title">"Derechos de autor"</string>
     <string name="license_title">"Licencia"</string>
     <string name="terms_title">"Términos y condiciones"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Licencias de software libre"</string>
     <string name="settings_license_activity_unavailable">"Se ha producido un problema al intentar cargar las licencias."</string>
     <string name="settings_license_activity_loading">"Cargando..."</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c1299d5..23caacc 100644 (file)
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -498,6 +498,10 @@
     <string name="copyright_title">"Copyright"</string>
     <string name="license_title">"Licence"</string>
     <string name="terms_title">"Conditions d\'utilisation"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Ouvrir licences source"</string>
     <string name="settings_license_activity_unavailable">"Un problème est survenu lors du chargement des licences."</string>
     <string name="settings_license_activity_loading">"Chargement..."</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c1433d9..97491e0 100644 (file)
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -498,6 +498,10 @@
     <string name="copyright_title">"Copyright"</string>
     <string name="license_title">"Licenza"</string>
     <string name="terms_title">"Termini e condizioni"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Licenze open source"</string>
     <string name="settings_license_activity_unavailable">"Errore durante il caricamento delle licenze."</string>
     <string name="settings_license_activity_loading">"Caricamento..."</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e716393..2a3d233 100644 (file)
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -498,6 +498,10 @@
     <string name="copyright_title">"저작권"</string>
     <string name="license_title">"라이센스"</string>
     <string name="terms_title">"약관"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"오픈소스 라이센스"</string>
     <string name="settings_license_activity_unavailable">"라이센스를 로드하는 동안 문제가 발생했습니다."</string>
     <string name="settings_license_activity_loading">"로드 중..."</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6a3727a..af7bb4c 100644 (file)
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -500,6 +500,10 @@
     <string name="copyright_title">"Opphavsrett"</string>
     <string name="license_title">"Lisens"</string>
     <string name="terms_title">"Betingelser"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Åpen kildekode-lisenser"</string>
     <string name="settings_license_activity_unavailable">"Kunne ikke hente lisensene."</string>
     <string name="settings_license_activity_loading">"henter…"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 46adabe..1b57d4d 100644 (file)
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -498,6 +498,10 @@
     <string name="copyright_title">"Auteursrecht"</string>
     <string name="license_title">"Licentie"</string>
     <string name="terms_title">"Algemene voorwaarden"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Open-sourcelicenties"</string>
     <string name="settings_license_activity_unavailable">"Er is een probleem bij het laden van de licenties."</string>
     <string name="settings_license_activity_loading">"Laden..."</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7ccff23..a452c0c 100644 (file)
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -498,6 +498,10 @@
     <string name="copyright_title">"Prawa autorskie"</string>
     <string name="license_title">"Licencja"</string>
     <string name="terms_title">"Warunki i zasady korzystania"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Licencje open source"</string>
     <string name="settings_license_activity_unavailable">"Wystąpił problem podczas ładowania licencji."</string>
     <string name="settings_license_activity_loading">"Ładowanie..."</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index cc6a901..18353e3 100644 (file)
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -498,6 +498,10 @@
     <string name="copyright_title">"Авторские права"</string>
     <string name="license_title">"Лицензия"</string>
     <string name="terms_title">"Условия предоставления услуг"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Лицензии Open Source"</string>
     <string name="settings_license_activity_unavailable">"При загрузке лицензий произошла ошибка."</string>
     <string name="settings_license_activity_loading">"Идет загрузка…"</string>

diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 5b3b651..5f3ec45 100644 (file)
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -55,15 +55,19 @@
     <item>"插入后从不进入休眠状态"</item>
     <item>"从不"</item>
   </string-array>
-    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
-    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
-    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
-    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
-    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
-    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
-    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
-    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
-    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
+  <string-array name="battery_history_type_spinner">
+    <item>"CPU 使用率"</item>
+    <item>"网络使用率"</item>
+    <item>"GPS 使用率"</item>
+    <item>"传感器使用率"</item>
+    <item>"部分激活使用率"</item>
+    <item>"其他使用率"</item>
+  </string-array>
+  <string-array name="battery_history_which_spinner">
+    <item>"自上次拔出后"</item>
+    <item>"自启动以来的总时间"</item>
+    <item>"所有时间总计"</item>
+  </string-array>
   <string-array name="usage_stats_display_order_types">
     <item>"使用时间"</item>
     <item>"启动次数"</item>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3be275a..1428b85 100644 (file)
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -498,6 +498,10 @@
     <string name="copyright_title">"版权"</string>
     <string name="license_title">"许可"</string>
     <string name="terms_title">"条款"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"开源许可"</string>
     <string name="settings_license_activity_unavailable">"载入许可时出现问题。"</string>
     <string name="settings_license_activity_loading">"正在载入..."</string>

diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 2ec9ed2..a399602 100644 (file)
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -55,15 +55,19 @@
     <item>"插入時絕不"</item>
     <item>"從不"</item>
   </string-array>
-    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
-    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
-    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
-    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
-    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
-    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
-    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
-    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
-    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
+  <string-array name="battery_history_type_spinner">
+    <item>"CPU 使用率"</item>
+    <item>"網路使用率"</item>
+    <item>"GPS 使用率"</item>
+    <item>"感應器使用率"</item>
+    <item>"部分喚醒使用率"</item>
+    <item>"其他使用率"</item>
+  </string-array>
+  <string-array name="battery_history_which_spinner">
+    <item>"自上次拔除插頭後的時間"</item>
+    <item>"開機後總時間"</item>
+    <item>"所有時間的總計"</item>
+  </string-array>
   <string-array name="usage_stats_display_order_types">
     <item>"使用時間"</item>
     <item>"啟動計數"</item>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b8ffcbc..629cb65 100644 (file)
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -498,6 +498,10 @@
     <string name="copyright_title">"版權"</string>
     <string name="license_title">"授權"</string>
     <string name="terms_title">"條款及細則"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"開啟原始授權"</string>
     <string name="settings_license_activity_unavailable">"載入授權時發生問題"</string>
     <string name="settings_license_activity_loading">"載入中..."</string>