AI 144558: am: CL 144556 Pick up today's modified translations.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 144558
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c9267b9..df2874f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -491,6 +491,14 @@
<string name="location_gps">"GPS-Satelliten aktivieren"</string>
<string name="location_street_level">"Auf Straßenebene lokalisieren (deaktivieren, um Akku zu sparen)"</string>
<string name="location_gps_disabled">"Auf Straßenebene lokalisieren (höherer Akkuverbrauch, im Freien)"</string>
+ <!-- no translation found for location_warning_title (788624242969337259) -->
+ <skip />
+ <!-- no translation found for location_warning_message (2455390825908728808) -->
+ <skip />
+ <!-- no translation found for agree (6288718671527758326) -->
+ <skip />
+ <!-- no translation found for disagree (6221069272309799230) -->
+ <skip />
<string name="about_settings">"Telefoninfo"</string>
<string name="about_settings_summary">"Rechtliche Hinweise, Telefonstatus und Softwareversion anzeigen"</string>
<string name="legal_information">"Rechtliche Hinweise"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e4396f2..7ed2e99 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -491,6 +491,14 @@
<string name="location_gps">"Habilitar satélites GPS"</string>
<string name="location_street_level">"Preciso en el nivel de calle (anula la selección para ahorrar batería)"</string>
<string name="location_gps_disabled">"Localizar en nivel de calle (requiere más batería además de la vista aérea)"</string>
+ <!-- no translation found for location_warning_title (788624242969337259) -->
+ <skip />
+ <!-- no translation found for location_warning_message (2455390825908728808) -->
+ <skip />
+ <!-- no translation found for agree (6288718671527758326) -->
+ <skip />
+ <!-- no translation found for disagree (6221069272309799230) -->
+ <skip />
<string name="about_settings">"Acerca del teléfono"</string>
<string name="about_settings_summary">"Ver información legal, estado del teléfono, versión del software"</string>
<string name="legal_information">"Información legal"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index f74b17f..58c9761 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -30,7 +30,7 @@
<item>"1分"</item>
<item>"2分"</item>
<item>"10分"</item>
- <item>"減光しない"</item>
+ <item>"常時点灯"</item>
</string-array>
<string-array name="wifi_security_entries">
<item>"自動"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6fe7c87..9dacb63 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -375,7 +375,7 @@
<string name="brightness">"画面の明るさ"</string>
<string name="brightness_summary">"画面の明るさを調整する"</string>
<string name="screen_timeout">"バックライト消灯"</string>
- <string name="screen_timeout_summary">"画面のバックライトを自動消灯するまでの時間"</string>
+ <string name="screen_timeout_summary">"画面バックライトを自動消灯するまでの時間"</string>
<string name="sim_lock_settings">"SIMカードロック設定"</string>
<string name="sim_lock_settings_category">"SIMカードロック設定"</string>
<string name="sim_lock_settings_title">"SIMカードロック"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a452c0c..5e0b564 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -491,6 +491,14 @@
<string name="location_gps">"Użyj satelit GPS"</string>
<string name="location_street_level">"Ustalanie położenia z dokładnością do ulicy (wyłącz, aby oszczędzać baterię)"</string>
<string name="location_gps_disabled">"Podaje dokładne położenie (zużywa więcej baterii, działa na zewnątrz)"</string>
+ <!-- no translation found for location_warning_title (788624242969337259) -->
+ <skip />
+ <!-- no translation found for location_warning_message (2455390825908728808) -->
+ <skip />
+ <!-- no translation found for agree (6288718671527758326) -->
+ <skip />
+ <!-- no translation found for disagree (6221069272309799230) -->
+ <skip />
<string name="about_settings">"Informacje o telefonie"</string>
<string name="about_settings_summary">"Wyświetl informacje prawne, stan telefonu, wersję oprogramowania"</string>
<string name="legal_information">"Informacje prawne"</string>