From 401299739295b2305707810bbae2e49eadac50ba Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Thu, 22 Nov 2012 23:18:51 -0800
Subject: [PATCH] Import translations. DO NOT MERGE

Change-Id: I21102fa6155368b3948a2606f9e30fde08b508b1
Auto-generated-cl: translation import
---
 res/values-ar/strings.xml     |  2 +-
 res/values-ca/strings.xml     |  4 ++--
 res/values-da/strings.xml     |  2 +-
 res/values-de/strings.xml     |  8 ++++----
 res/values-es-rUS/strings.xml |  4 ++--
 res/values-es/strings.xml     |  2 +-
 res/values-et/strings.xml     |  2 +-
 res/values-fi/strings.xml     |  2 +-
 res/values-hr/strings.xml     |  2 +-
 res/values-hu/strings.xml     |  2 +-
 res/values-lt/strings.xml     |  2 +-
 res/values-nb/strings.xml     |  2 +-
 res/values-nl/strings.xml     |  2 +-
 res/values-pt-rPT/strings.xml |  2 +-
 res/values-ro/strings.xml     |  2 +-
 res/values-ru/strings.xml     | 10 +++++-----
 res/values-sk/strings.xml     |  2 +-
 res/values-sr/strings.xml     |  2 +-
 res/values-sv/strings.xml     |  2 +-
 res/values-tr/strings.xml     |  2 +-
 res/values-uk/strings.xml     |  4 ++--
 res/values-vi/strings.xml     |  4 ++--
 res/values-zh-rCN/strings.xml |  2 +-
 res/values-zh-rTW/strings.xml |  2 +-
 24 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 66dc269c784..e2aa26845b6 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"اختيار خلفية من"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"حلم اليقظة"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"عند الإرسال أو السكون والشحن"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"أي الخيارين"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"أيهما"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"أثناء الشحن"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"أثناء الإرساء"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"إيقاف"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4b0462f3de4..04e5d81a2a2 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -720,12 +720,12 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecciona fons de pantalla de"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Estalvi de pantalla"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quan el dispositiu estigui en un connector o inactiu i carregant-se"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Una de les dues"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Els dos casos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Mentre es carrega"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quan el dispositiu estigui en un connector"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivat"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Per comprovar què passa quan el telèfon està connectat o en mode de suspensió, activa l\'estalvi de pantalla."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quan s\'ha d\'activar l\'estalvi de pantalla"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quan s\'ha d\'activar"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Comença ara mateix"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configuració"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 13ca5cd2d30..0f936049834 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vælg baggrund fra"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdrøm"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Når enheden er tilsluttet en dockingstation eller i dvale og i færd med at oplade"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Begge dele"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Enten eller"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under opladning"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Når enheden er tilsluttet en dockingstation"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Fra"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a82fac4ae87..b8ab38c4a7a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -721,7 +721,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Hintergrund auswählen"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Bei angedocktem Gerät oder im Ruhezustand beim Aufladen"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Beides"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Immer"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Während des Ladevorgangs"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Bei angedocktem Gerät"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Aus"</string>
@@ -1052,7 +1052,7 @@
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Cache leeren"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
     <string name="controls_label" msgid="7611113077086853799">"Steuerung"</string>
-    <string name="force_stop" msgid="7435006169872876756">"Stoppen erzwingen"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Beenden erzwingen"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Insgesamt"</string>
     <string name="application_size_label" msgid="8494609207373874267">"App"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"USB-Speicher-App"</string>
@@ -1133,7 +1133,7 @@
     <string name="app_forward_locked" msgid="6331564656683790866">"Die App ist kopiergeschützt."</string>
     <string name="invalid_location" msgid="2786030127356312746">"Installationspfad ist nicht gültig."</string>
     <string name="system_package" msgid="6222593098063037137">"Systemupdates können nicht auf externen Datenträgern installiert werden."</string>
-    <string name="force_stop_dlg_title" msgid="977530651470711366">"Stoppen erzwingen?"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"Beenden erzwingen?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"Das Beenden der App zu erzwingen kann zu unerwünschtem Verhalten führen."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"App kann nicht verschoben werden. <xliff:g id="REASON">%1$s</xliff:g>"</string>
@@ -1383,7 +1383,7 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Laufzeit"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Zeit ohne Signal"</string>
-    <string name="battery_action_stop" msgid="649958863744041872">"Stoppen erzwingen"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Beenden erzwingen"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"App-Info"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"App-Einstellungen"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Bildschirmeinstellungen"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f0791c55886..402a8a80234 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -718,9 +718,9 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Elegir fondo de pantalla de"</string>
-    <string name="screensaver_settings_title" msgid="3349790120327233241">"Activar Daydream"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Activar protector de pantalla"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Cuando esté conectado o cuando se encuentre inactivo y cargándose"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Cualquiera de las dos opciones"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"En ambos casos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando esté conectado"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Apagado"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b3e27fae1fa..d349944ef21 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -725,7 +725,7 @@
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando el dispositivo esté en un conector"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Para controlar lo que ocurre cuando el teléfono está conectado o inactivo, debes activar el salvapantallas."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Cuándo activar el salvapantallas"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Cuándo activarlo"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Iniciar ahora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ajustes"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index c5138cacaee..fb63cfa7745 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Taustapildi valimine:"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Unerežiim"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kui on dokitud või puhkerežiimis ja laeb"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Kui on dokitud või puhkerežiimis"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Kui on dokitud või laeb"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Laadimise ajal"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kui on dokitud"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Välja"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9bbb30f6ab2..b00eb7b19ad 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Valitse taustakuva"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Unelmat"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Telakoituna tai virransäästötilassa ja ladattaessa"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Joko"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Kumpi vain"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Latauksen aikana"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Telakoituna"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Pois käytöstä"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c5478427695..01d4a01b71f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Odabir pozadinske slike iz"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Sanjarenje"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kada je uređaj na priključnoj stanici ili kada miruje i puni se"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ili"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bilo koje"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tijekom punjenja"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kada je na priključnoj stanici"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Isključeno"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 20e4ebb7a30..39a5af821d7 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Válasszon tapétát innen:"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Álmodozás"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Dokkolt vagy alvó állapotban, töltés közben"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Mindegy"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bármelyik"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Töltés közben"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Dokkolt állapotban"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Ki"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8fab8db4240..76424ea35a3 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pasirinkti darbalaukio foną iš"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Svajonė"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kai yra doke arba kai veikia miego režimas ir kraunamas akumuliatorius"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bet kuris variantas"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Abiem atvejais"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Įkraunant"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kai yra doke"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Išjungta"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 290243f261e..fac7f4151f7 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Velg bakgrunnsbilde fra"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdrøm"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Når enheten er plassert i dokken eller under lading i hvilemodus"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Enten eller"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Begge"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under lading"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Når enheten er plassert i dokken"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bb23bfead23..3bfe192c7e0 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Achtergrond kiezen van"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdromen"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Wanneer gedockt, in slaapstand of tijdens het opladen"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Een van beide"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Maakt niet uit"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tijdens het opladen"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Wanneer gedockt"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Uit"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 37a2fbfba99..480df40ea02 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Escolher imagem de fundo de"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quando ancorado ou em suspensão e a carregar"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Qualquer dos modos"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ou"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Enquanto está a carregar"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Enquanto ancorado"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desligado"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 587ba1f4e10..3b501f47f54 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Aleg. o imag. de fundal de la"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Când dispozitivul este andocat sau în modul inactiv şi se realizează încărcarea"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Oricare"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"În ambele situații"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"În timpul încărcării"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Când dispozitivul este andocat"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Dezactivat"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1e9d847a4a0..def9dcf891e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -519,7 +519,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Выключено"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недоступно, так как отключена связь малого радиуса действия"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Когда включена эта функция, данные приложений можно передавать на другие устройства с поддержкой связи малого радиуса действия. Например, отправлять страницы браузера, видео YouTube, контакты и другие сведения."\n\n"Просто разместите устройства поблизости (например, совместите их задние панели) и коснитесь экрана. Передаваемые данные зависят от приложения."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Когда включена эта функция, вы можете обмениваться данными между устройствами, просто приложив их друг к другу."\n\n"Передавать можно практически любые данные, включая контакты, ссылки, веб-страницы, фотографии и видео."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Обнаружение сетевых служб"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Разрешить приложениям на других устройствах обнаруживать приложения на этом устройстве"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -1194,7 +1194,7 @@
     <string name="auto_punctuate" msgid="4595367243950425833">"Автопунктуация"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Настройки внешней клавиатуры"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Нажмите дважды клавишу \"Пробел\" для ввода точки"</string>
-    <string name="show_password" msgid="3001113966880559611">"Показывать пароль"</string>
+    <string name="show_password" msgid="3001113966880559611">"Показывать пароль при вводе"</string>
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"При использовании этого способа могут собираться все вводимые данные, в том числе пароли и номера кредитных карт. Способ ввода запрашиваетя приложением \"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>\". Использовать этот способ ввода?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Для проверки орфографии будет использоваться приложение <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>, которое может собирать все вводимые данные, в том числе пароли и номера кредитных карт. Продолжить?"</string>
@@ -1507,7 +1507,7 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"Возврат к заводским настройкам"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Копирование данных"</string>
     <string name="backup_data_summary" msgid="9157861529438245957">"Сохранять резервные копии данных приложений, паролей точек доступа Wi-Fi и настроек на серверах Google"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Резервный аккаунт"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Аккаунт для резервирования"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Не найдены аккаунты с резервными копиями данных"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автовосстановление"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"При переустановке приложения восстановить резервную копию настроек и данных"</string>
@@ -1652,7 +1652,7 @@
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"Включено трассировок: <xliff:g id="NUM">%1$d</xliff:g>"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Все трассировки включены"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Вкл. трассировку OpenGL"</string>
-    <string name="debug_layout" msgid="5981361776594526155">"Показывать границы макета"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Показывать границы элементов"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Показывать границы клипа, поля и т. д."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Показывать загрузку ЦП"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Экран, показывающий текущую загрузку ЦП"</string>
@@ -1807,7 +1807,7 @@
     <string name="user_owner" msgid="3879126011135546571">"Владелец"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Псевдоним"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Добавить пользователя"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Если вашим устройством пользуется кто-то ещё, создайте отдельных пользователей. У каждого из них будет свое пространство, где можно, например, установить приложения или выбрать обои. Некоторые параметры, например настройки сети Wi-Fi, будут общими для всех."\n\n"Каждый новый пользователь должен выполнить настройку."\n\n"Пользователи могут разрешать обновления для любых аккаунтов на устройстве."</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Если устройством пользуется несколько человек, заведите для них отдельные учетные записи. В результате у каждого пользователя появится свое пространство, где можно будет установить собственные приложения или обои. При этом некоторые параметры, например настройки Wi-Fi, останутся общими для всех."\n\n"Обновление приложений будет происходить для всех учетных записей одновременно. Установить обновление сможет любой пользователь."\n\n</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Каждый новый пользователь должен выполнить настройку."\n\n"Пользователи могут разрешать обновления для любых аккаунтов на устройстве."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Настроить аккаунт?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Если у пользователя нет возможности настроить аккаунт прямо сейчас, он сможет сделать это позже."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index df033da762d..a2d4e766cc6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrať tapetu z"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Šetrič obrazovky"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Pri vložení do doku alebo pri nabíjaní v režime spánku"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Oboje"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"V oboch prípadoch"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Pri nabíjaní"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Počas prítomnosti zariadenia v doku"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Vypnuté"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f85873ed17f..e272c8facb0 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Избор позадине из"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Сањарење"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Када је на базној станици или у стању спавања и пуни се"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Било које"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Било које од ова два"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Током пуњења"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Док је на базној станици"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Искључено"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index beecbc08abb..dd8b10c27eb 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Välj bakgrund från"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdrömmar"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"När enheten dockas eller laddas i viloläge"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Antingen"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Båda"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under laddning"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Medan enheten dockas"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 57eaaabf5a5..752361a7551 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Şuradan duvar kağıdı seçin:"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Hafif uyku"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Yuvadayken veya uyku modunda ve şarj edilirken"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"İkisinden biri"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Her ikisi"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Şarj olurken"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Yuvadayken"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Kapalı"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 62035c94c87..fff12a85b93 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Вибрати фоновий малюнок з"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Заставка"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Коли в док-станції або в режимі сну й заряджання"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Будь-який"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Завжди"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Під час заряджання"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Коли в док-станції"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Вимк."</string>
@@ -1569,7 +1569,7 @@
     <string name="sync_active" msgid="8476943765960863040">"Синхронізація активна"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"Синхронізація"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Наразі виникли проблеми із синхронізацією. Незабаром вона відновиться."</string>
-    <string name="add_account_label" msgid="7811707265834013767">"Додати облік. запис"</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Додати обліковий запис"</string>
     <string name="background_data" msgid="5779592891375473817">"Фонові дані"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"Програми можуть будь-коли синхроніз., надсил. й отрим. дані"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Вимкн. фонові дані?"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ba39b06efce..572ebd35ed0 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -720,9 +720,9 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chọn hình nền từ"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Chế độ ngủ"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Khi được gắn đế hoặc ở chế độ ngủ và sạc pin"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Hoặc"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Khi gắn đế và sạc"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Trong khi sạc"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Khi được gắn đế"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Khi gắn đế"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Tắt"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Để kiểm soát những gì diễn ra khi điện thoại được gắn đế và/hoặc ở chế độ ngủ, hãy bật Chế độ ngủ."</string>
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Khi vào chế độ ngủ"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 94767b5fa7e..beb137394d0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"选择壁纸来源"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"互动屏保"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"插入基座或休眠且正在充电时"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"任意一种情况"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"以上任一情况"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充电时"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"插入基座时"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"已关闭"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d89f2e27874..7d36cb26e24 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -720,7 +720,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"選擇桌布來源"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"休眠模式"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"安置於座架上或休眠及充電時"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"皆可"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"以上任一情況"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充電時"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"安置於座架上時"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"關閉"</string>