From c45f506538819173af66cef729850c07e91fe334 Mon Sep 17 00:00:00 2001
From: Jake Hamby <jhamby@google.com>
Date: Fri, 3 Dec 2010 17:02:02 -0800
Subject: [PATCH 1/6] Reduce max BT device length to 246 bytes due to Bluez
 bug. (DO NOT MERGE)

The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.

Bug: 3246147
Change-Id: I320fc7a9a0bfdf8067387ec8de80efccaca2b5f6
---
 .../android/settings/bluetooth/BluetoothNamePreference.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/bluetooth/BluetoothNamePreference.java b/src/com/android/settings/bluetooth/BluetoothNamePreference.java
index c99ab4c9982..ad425fccf88 100644
--- a/src/com/android/settings/bluetooth/BluetoothNamePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothNamePreference.java
@@ -40,7 +40,8 @@ import android.widget.EditText;
  */
 public class BluetoothNamePreference extends EditTextPreference implements TextWatcher {
     private static final String TAG = "BluetoothNamePreference";
-    private static final int BLUETOOTH_NAME_MAX_LENGTH_BYTES = 248;
+    // max. length reduced from 248 to 246 bytes to work around Bluez bug
+    private static final int BLUETOOTH_NAME_MAX_LENGTH_BYTES = 246;
 
     private LocalBluetoothManager mLocalManager;
 

From 0ca84e108e4928aafe620735dba36136f8fb4e21 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Mon, 7 Feb 2011 13:38:01 -0800
Subject: [PATCH 2/6] Import revised translations.  DO NOT MERGE

Change-Id: If53b83d77929ba02915eeafd3c614599316cca1e
---
 res/values-bg/strings.xml        |  4 ++--
 res/values-da-nokeys/strings.xml |  2 +-
 res/values-da/strings.xml        | 12 ++++++------
 res/values-de/strings.xml        | 21 ++++++++++-----------
 res/values-es-rUS/strings.xml    |  4 ++--
 res/values-fr/strings.xml        | 24 ++++++++++++------------
 res/values-it/strings.xml        |  2 +-
 res/values-ja/arrays.xml         | 10 +++++-----
 res/values-ja/strings.xml        | 16 ++++++++--------
 res/values-ko/strings.xml        |  2 +-
 res/values-pl/strings.xml        |  4 ++--
 res/values-ru/strings.xml        | 26 +++++++++++++-------------
 res/values-sl/strings.xml        |  2 +-
 res/values-sv/strings.xml        |  2 +-
 tests/res/values-ru/strings.xml  |  2 +-
 15 files changed, 66 insertions(+), 67 deletions(-)

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8a0c11d9fb9..13d02c4c4da 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1123,8 +1123,8 @@
     <string name="credentials_enabled" msgid="7588607413349978930">"Хранилището за идентификационни данни е активирано."</string>
     <string name="credentials_disabled" msgid="7453188089059045380">"Хранилището за идентификационни данни е деактивирано."</string>
     <!-- outdated translation 5563670455056905298 -->     <string name="encrypted_fs_category" msgid="1841367653663913956">"Шифрована файлова система"</string>
-    <!-- outdated translation 1460957282314335666 -->     <string name="encrypted_fs_enable" msgid="3884033081603327729">"Шифроване на лични потребителски данни"</string>
-    <!-- outdated translation 1350828979802222331 -->     <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Активиране на хранилище за шифровани файлови системи за лични потребителски данни на това устройство"</string>
+    <!-- outdated translation 1460957282314335666 -->     <string name="encrypted_fs_enable" msgid="3884033081603327729">"Шифроване на частни потребителски данни"</string>
+    <!-- outdated translation 1350828979802222331 -->     <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Активиране на хранилище за шифровани файлови системи за частни потребителски данни на това устройство"</string>
     <!-- outdated translation 5616902699813992220 -->     <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Активирането на шифровани файлови системи изисква изтриване на данните на устройството."</string>
     <!-- outdated translation 6188718276152942357 -->     <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Деактивирането на шифровани файлови системи изисква изтриване на данните на устройството."</string>
     <!-- outdated translation 5517966150893551199 -->     <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Активиране"</string>
diff --git a/res/values-da-nokeys/strings.xml b/res/values-da-nokeys/strings.xml
index f65be78d1ab..115916a391c 100644
--- a/res/values-da-nokeys/strings.xml
+++ b/res/values-da-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"Administ. programmer"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Programadministration"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 360de970b31..1bdee129d37 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -598,8 +598,8 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Nulstillingen af APN-standardindstillinger er afsluttet"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Gendannelse af fabriksdata"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Sletter alle data på telefonen"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", bl.a.:"\n\n<li>"din Google-konto"</li>\n<li>"system- og programdata og -indstillinger"</li>\n<li>"downloadede programmer"</li>\n\n"Slet musik, billeder og andre brugerdata ved også at slette "<b>"USB-lager"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", bl.a. :"\n\n<li>"din Google-konto"</li>\n<li>"system- og programdata og -indstillinger"</li>\n<li>"downloadede programmer"</li>\n\n"Slet musik, billeder og andre brugerdata ved også at slette "<b>"SD-kortet"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", bl.a.:"\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og programmer"</li>\n<li>"downloadede programmer"</li>\n\n"Slet musik, billeder og andre brugerdata ved også at slette "<b>"USB-lager"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", bl.a. :"\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og programmer"</li>\n<li>"downloadede programmer"</li>\n\n"Slet musik, billeder og andre brugerdata ved også at slette "<b>"SD-kortet"</b>"."\n\n</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Slet USB-lager"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Slet SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Slet alle data på telefonens interne USB-lager, f.eks. musik og billeder."</string>
@@ -684,7 +684,7 @@
     <string name="lockpattern_need_to_unlock_wrong" msgid="5629093548611791080">"Beklager! Prøv igen:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Tegn et oplåsningsmønster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryk på Menu for at få hjælp."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Slip fingeren, når du er færdig."</string>
+    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Slip med fingeren, når du er færdig."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Forbind mindst <xliff:g id="NUMBER">%d</xliff:g> punkter. Prøv igen:"</string>
     <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Mønstret blev registreret!"</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Tegn mønstret igen for at bekræfte:"</string>
@@ -709,7 +709,7 @@
     <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Beskyt din telefon mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. "\n<font height="17">\n</font><b>"1"</b>"  På næste skærm kan du se et eksempel på, hvordan mønsteret tegnes. "\n<font height="17">\n</font><b>"2"</b>"  Når du er klar, kan du tegne dit eget personlige mønster til at låse op. Eksperimenter med forskellige mønstre, men forbind mindst fire punkter. "\n<font height="17">\n</font><b>"3"</b>"  Tegn dit mønster igen for at bekræfte. "\n<font height="17">\n</font><b>"Er du klar? Tryk på \"Næste\""</b>". "\n<font height="3">\n</font>"Du kan lade din telefon være ubeskyttet ved at trykke på \"Annuller\"."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Eksempel på et mønster"</string>
     <string name="lock_example_message" msgid="1838650097090632706">"Forbind mindst fire punkter."\n" "\n"Tryk på \"Næste\", når du er klar til at tegne dit eget mønster."</string>
-    <string name="manageapplications_settings_title" msgid="5712405848153426706">"Administ. programmer"</string>
+    <string name="manageapplications_settings_title" msgid="5712405848153426706">"Programadministration"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Administrer og fjern installerede programmer"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Programmer"</string>
     <string name="applications_settings_summary" msgid="2714215108369119717">"Administ. programmer, konf. genveje til hurtig start"</string>
@@ -746,7 +746,7 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Vælg indstillinger for filtret"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
-    <string name="filter_apps_third_party" msgid="7786348047690140979">"Overført"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Downloads"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kørende"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lager"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
@@ -1138,7 +1138,7 @@
     <string name="privacy_settings_title" msgid="1987089301293213705">"Indstillinger for fortrolighed"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Sikkerhedskopiering og gendannelse"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige oplysninger"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopier mine data"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopier data"</string>
     <string name="backup_data_summary" msgid="6515285107793232815">"Sikkerhedskopier programdata, Wi-Fi-adgangskoder og andre indstillinger på Googles servere"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk gendannelse"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Hvis jeg geninstallerer et program, skal sikkerhedskopierede indstillinger eller andre data gendannes"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9069f35f3ae..6aa8fb81a2d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -117,7 +117,7 @@
     <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
     <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Bluetooth zu aktivieren und Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Telefone sichtbar zu machen. Möchten Sie dies tun?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth wird aktiviert..."</string>
-    <string name="date_and_time" msgid="4114084177056654663">"Einstellungen für Datum &amp;amp Uhrzeit"</string>
+    <string name="date_and_time" msgid="4114084177056654663">"Einstellungen für Datum &amp; Uhrzeit"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"Zeit einstellen"</string>
@@ -210,7 +210,7 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-Einstellungen"</string>
     <string name="cancel" msgid="6859253417269739139">"Abbrechen"</string>
     <string name="settings_label" msgid="1626402585530130914">"Einstellungen"</string>
-    <string name="settings_label_launcher" msgid="8344735489639482340">"Ein- stellungen"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Einstellung."</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Einstellungen"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flugmodus"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Alle drahtlosen Verbindungen deaktivieren"</string>
@@ -278,7 +278,7 @@
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Das Passwort muss mindestens eine Zahl enthalten."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Das Passwort muss mindestens ein Symbol enthalten."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Abbrechen"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Abbruch"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Geräteverwaltung"</string>
     <string name="manage_device_admin" msgid="3864120111085199551">"Geräte-Administratoren"</string>
     <string name="manage_device_admin_summary" msgid="915390201809231575">"Geräteadministratoren hinzufügen oder entfernen"</string>
@@ -434,7 +434,7 @@
     <string name="media_volume_title" msgid="3576565767317118106">"Medien"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Lautstärke für Musik und Videos festlegen"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Wecker"</string>
-    <string name="dock_settings_summary" msgid="455802113668982481">"Audioeinstellungen für angeschlossenen Dock"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Audioeinstellungen für angeschlossenes Dock"</string>
     <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Tastentöne"</string>
     <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Töne bei Telefonwahl"</string>
     <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Töne bei Telefonwahl"</string>
@@ -452,10 +452,10 @@
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Dock-Einstellungen"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Einstellungen für angeschlossenen Desktop-Dock"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Einstellungen für angeschlossenen Kfz-Dock"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Einstellungen für angeschlossenes Desktop-Dock"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Einstellungen für angeschlossenes Kfz-Dock"</string>
     <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefon nicht angedockt"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Einstellungen für angeschlossenen Dock"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Einstellungen für angeschlossenes Dock"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dock nicht gefunden"</string>
     <string name="dock_not_found_text" msgid="3035260358985111855">"Zur Konfiguration des Dock-Audios muss das Telefon angedockt sein."</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Ton bei Dock-Anschluss"</string>
@@ -890,7 +890,7 @@
     <string name="launch_count_label" msgid="4019444833263957024">"Anzahl"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Nutzungszeit"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Eingabehilfen"</string>
-    <string name="accessibility_settings_title" msgid="2130492524656204459">"Einstellungen für Eingabehilfe"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Einstellungen für Eingabehilfen"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Optionen für Eingabehilfe verwalten"</string>
     <string name="toggle_accessibility_title" msgid="650839277066574497">"Eingabehilfen"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Eingabehilfendienste"</string>
@@ -1096,13 +1096,12 @@
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nicht festgelegt)"</string>
     <string name="credentials_category" msgid="8536992056377271234">"Anmeldeinformationsspeicher"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Sichere Anmeldeinfos"</string>
-    <!-- unknown quoting pattern: original -1, translation 1 -->
-    <string name="credentials_access_summary" msgid="319662078718574168">"Anwendungen können sichere Zertifikate &amp;amp; Anmeldeinform. abrufen"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Anwendungen können sichere Zertifikate und Anmeldeinformationen abrufen"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Passwort eingeben"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Geben Sie das Passwort für den Anmeldeinformationsspeicher ein."</string>
     <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Von USB-Speicher installieren"</string>
     <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Von SD-Karte installieren"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Verschl. Zertifikate von USB-Speicher inst."</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Verschlüsselte Zertifikate von USB-Speicher installieren"</string>
     <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Verschlüsselte Zertifikate von SD-Karte installieren"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Passwort festlegen"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Passwort für Anmeldeinformationsspeicher festlegen oder ändern"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c2196a64be5..348fbeef442 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -598,7 +598,7 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Restablecimiento completado de configuración de APN predeterminada"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restabl. datos de fábrica"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Borra todos los datos del teléfono"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Si lo haces, se borrarán todos los datos del "<b>"almacenamiento interno"</b>"de tu teléfono, incluida:"\n\n<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de la aplicación"</li>\n<li>"las aplicaciones descargadas"</li>\n\n"Si deseas borrar todos los datos de este teléfono, deberás borrar el "<b>"almacenamiento USB"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Si lo haces, se borrarán todos los datos del "<b>"almacenamiento interno"</b>" de tu teléfono, incluida:"\n\n<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de la aplicación"</li>\n<li>"las aplicaciones descargadas"</li>\n\n"Si deseas borrar todos los datos de este teléfono, deberás borrar el "<b>"almacenamiento USB"</b>"."\n\n</string>
     <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Si lo haces, se borrarán todos los datos del "<b>"almacenamiento interno"</b>"de tu teléfono, incluida:"\n\n<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de la aplicación"</li>\n<li>"las aplicaciones descargadas"</li>\n\n"Si también deseas borrar la música, las fotos y otros datos de usuario, deberás borrar la "<b>"tarjeta SD"</b>"."\n\n</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Borrar almacenamiento USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Borrar la tarjeta SD"</string>
@@ -1099,7 +1099,7 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Permitir a las aplic. acceder a certificados seguros y otras cred."</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ingresar contraseña"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Ingresar la contraseña de almacenamiento de la credencial"</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalar desde almacenamiento USB"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalar desde USB"</string>
     <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalar de la tarjeta SD"</string>
     <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Instalar certificados encriptados del almacenamiento USB"</string>
     <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instalar certificados encriptados de la tarjeta SD"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 65b3a971475..69ff2fb4e80 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -399,7 +399,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Passerelle"</string>
     <string name="wifi_netmask" msgid="4520635321425529085">"Masque de réseau"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi mobile"</string>
+    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Point d\'accès Wi-Fi mobile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actif"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erreur liée au point d\'accès Wi-Fi mobile"</string>
     <string name="wifi_tether_settings_text" msgid="123573487844470195">"Paramètres du point d\'accès Wi-Fi mobile"</string>
@@ -628,10 +628,10 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurer mess. vocale, transferts d\'appel, mises en attente, numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="4315031513434087777">"Partage de connexion"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Point d\'accès Wi-Fi mobile"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Partage de connexion et point d\'accès mobile"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Partagez la connexion Internet de votre mobile via un câble USB."</string>
+    <string name="tether_settings_title_both" msgid="2734066355556891504">"Partage connexion/point accès mobile"</string>
+    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Partager la connexion Internet de votre mobile via un câble USB"</string>
     <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Transformez votre mobile en point d\'accès Wi-Fi mobile."</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Partagez la connexion Internet de votre mobile via un câble USB ou transformez votre appareil en point d\'accès Wi-Fi mobile."</string>
+    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Partager la connexion Internet de votre mobile via un câble USB ou transformer votre appareil en point d\'accès Wi-Fi mobile"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Via USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Connexion USB établie, cochez l\'option adéquate pour partager la connexion."</string>
@@ -709,7 +709,7 @@
     <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Protégez votre téléphone contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. "\n<font height="17">\n</font><b>"1"</b>"  L\'écran suivant vous présente un exemple de schéma. "\n<font height="17">\n</font><b>"2"</b>"  Lorsque vous êtes prêt, dessinez votre propre schéma de déverrouillage. Essayez-en plusieurs, mais veillez à relier au moins quatre points. "\n<font height="17">\n</font><b>"3"</b>"  Reproduisez votre schéma pour confirmer votre choix. "\n<font height="17">\n</font><b>"Pour commencer, appuyez sur \"Suivant\""</b>". "\n<font height="3">\n</font>"Si vous ne souhaitez pas activer la protection, appuyez sur \"Annuler\"."</font></string>
     <string name="lock_example_title" msgid="8052305554017485410">"Exemple de schéma"</string>
     <string name="lock_example_message" msgid="1838650097090632706">"Reliez au moins quatre points."\n" "\n"Sélectionnez \"Suivant\" pour créer votre propre schéma."</string>
-    <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gérer les applications"</string>
+    <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gérer applications"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gérer et supprimer les applications installées"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Applications"</string>
     <string name="applications_settings_summary" msgid="2714215108369119717">"Gérer les applications, configurer des raccourcis de lancement rapide"</string>
@@ -718,7 +718,7 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Autoriser l\'installation d\'applications ne provenant pas d\'Android Market"</string>
     <string name="install_all_warning" msgid="1923717607319933741">"Votre téléphone et vos données personnelles sont très vulnérables face à des applications provenant de sources inconnues. Vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informations sur l\'application"</string>
-    <string name="storage_label" msgid="8700867073480107253">"Mémoire"</string>
+    <string name="storage_label" msgid="8700867073480107253">"Stockage"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Lancer par défaut"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Autorisations"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
@@ -747,8 +747,8 @@
     <string name="filter_dlg_title" msgid="6507663329723966854">"Options du filtre"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Toutes"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Téléchargées"</string>
-    <string name="filter_apps_running" msgid="7767071454371350486">"En cours d\'exécution"</string>
-    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Mémoire de stockage USB"</string>
+    <string name="filter_apps_running" msgid="7767071454371350486">"En cours"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Stockage USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sur la carte SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Désactivée"</string>
     <string name="no_applications" msgid="5190227407135243904">"Aucune application"</string>
@@ -799,7 +799,7 @@
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
     <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> libre"</string>
-    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> utilisé"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> utilisés"</string>
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
@@ -980,11 +980,11 @@
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Paramètres de \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Paramètres de la synthèse vocale"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Synthèse vocale"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Tjrs utiliser mes param."</string>
-    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Les param. par défaut ci-dessous remplacent les param. de l\'application"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utiliser mes paramètres"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Remplacer les paramètres de l\'application par les paramètres ci-dessous"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Paramètres par défaut"</string>
     <string name="tts_default_synth_title" msgid="29467896463371992">"Moteur par défaut"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Définit le moteur de synthèse vocale à utiliser."</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Définir le moteur de synthèse vocale à utiliser"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Cadence"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Vitesse à laquelle le texte est énoncé"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f7b63af7ec8..8856447fd8e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1134,7 +1134,7 @@
     <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Avviso file system crittografati."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono chiamate emergenza"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Imposta il comportamento in caso di chiamata di emergenza"</string>
-    <string name="privacy_settings" msgid="9206631214140954954">"Privacy"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Backup e ripristino"</string>
     <string name="privacy_settings_title" msgid="1987089301293213705">"Impostazioni privacy"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Backup e ripristino"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dati personali"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 3524fc55ee8..7a749f64b9b 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -36,8 +36,8 @@
   </string-array>
   <string-array name="animations_summaries">
     <item msgid="4569165952409350897">"ウィンドウアニメーションを表示しない"</item>
-    <item msgid="4460915688877708508">"ウィンドウアニメーションの一部を表示"</item>
-    <item msgid="488968798204105119">"ウィンドウアニメーションをすべて表示"</item>
+    <item msgid="4460915688877708508">"一部のウィンドウアニメーションを表示する"</item>
+    <item msgid="488968798204105119">"すべてのウィンドウアニメーションを表示"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15秒"</item>
@@ -87,7 +87,7 @@
     <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続中..."</item>
     <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>による認証中..."</item>
     <item msgid="7928343808033020343">"IPアドレスを<xliff:g id="NETWORK_NAME">%1$s</xliff:g>から取得中..."</item>
-    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続されました"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続しました"</item>
     <item msgid="1330262655415760617">"保留中"</item>
     <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>から切断中..."</item>
     <item msgid="197508606402264311">"切断されました"</item>
@@ -151,7 +151,7 @@
   <string-array name="vibrate_entries">
     <item msgid="3388952299521009213">"常に使用"</item>
     <item msgid="6293147072807231256">"なし"</item>
-    <item msgid="1276641209451816572">"マナーモードでのみ"</item>
-    <item msgid="8418930333779132418">"マナーモードのときのみ"</item>
+    <item msgid="1276641209451816572">"マナーモードがオンのときのみ"</item>
+    <item msgid="8418930333779132418">"マナーモードがオフのときのみ"</item>
   </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 5e9498b006a..2e11d416145 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -286,7 +286,7 @@
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"BluetoothをONにする"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth設定"</string>
     <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth設定"</string>
-    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"端末の名前、接続や検出設定"</string>
+    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"接続、端末名、検出の許可を設定する"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetoothのペア設定リクエスト"</string>
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Bluetooth端末情報"</string>
     <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」とペア設定するためのPINを入力してください（0000か1234を試してください）。"</string>
@@ -334,13 +334,13 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"音楽とメディア"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"設定を保存"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"タグの読み取りと交換にNFCを使用"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"タグの読み取りと交換にNFCを使用する"</string>
     <string name="nfc_toggle_error" msgid="2233172102497535522">"エラーが発生しました。"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-FiをONにする"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi設定"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi設定"</string>
-    <string name="wifi_settings_summary" msgid="668767638556052820">"ワイヤレスアクセスポイントの設定"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"ワイヤレスアクセスポイントを設定する"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"ONにしています..."</string>
     <string name="wifi_stopping" msgid="5952909472548218348">"OFFにしています..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"エラー"</string>
@@ -412,7 +412,7 @@
     <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5007659014828162881">"音の設定"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"マナーモード"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"音楽、動画メディア、アラーム以外は消音"</string>
+    <string name="silent_mode_summary" msgid="3309650676072917899">"音楽、動画メディア、アラーム以外は消音する"</string>
     <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"音楽と動画メディア以外は消音"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"着信音"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
@@ -475,7 +475,7 @@
     <string name="brightness" msgid="2354961343555249270">"画面の明るさ"</string>
     <string name="brightness_summary" msgid="838917350127550703">"画面の明るさを調整する"</string>
     <string name="screen_timeout" msgid="4882669461447531301">"バックライト消灯"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"画面バックライトを自動消灯するまでの時間"</string>
+    <string name="screen_timeout_summary" msgid="2905757633140605334">"画面バックライトを自動消灯するまでの時間を設定する"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIMカードロック設定"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIMカードロック設定"</string>
@@ -641,7 +641,7 @@
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USBテザリングエラー"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ヘルプ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"モバイルネットワーク"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"ローミング、ネットワーク、APN設定"</string>
+    <string name="network_settings_summary" msgid="5149750850846813553">"ローミング、ネットワーク、APNを設定する"</string>
     <string name="location_title" msgid="1029961368397484576">"現在地"</string>
     <string name="location_network_based" msgid="8815705866861993344">"無線ネットワークを使用"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"無線ネットワーク使用のアプリケーション（地図など）で位置を表示する"</string>
@@ -819,7 +819,7 @@
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: 現在使用中です。管理するには[設定]をタップしてください。"</string>
     <string name="main_running_process_description" msgid="929204645380391397">"使用中のメインプロセスです。"</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"サービス<xliff:g id="COMP_NAME">%1$s</xliff:g>は使用中です。"</string>
-    <string name="process_provider_in_use_description" msgid="5586603325677678940">"プロバイダ<xliff:g id="COMP_NAME">%1$s</xliff:g>は使用中です。"</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"<xliff:g id="COMP_NAME">%1$s</xliff:g>プロバイダは使用中です。"</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"システムサービスを停止しますか？"</string>
     <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"このシステムサービスを停止してよろしいですか？停止すると、電源を一旦OFFにして再度ONにするまで、端末の一部の機能が正常に動作しなくなる場合があります。"</string>
     <string name="language_settings" msgid="502219872342167227">"言語とキーボード"</string>
@@ -1091,7 +1091,7 @@
     <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g>は有効です"</string>
     <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g>は無効です"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN設定"</string>
-    <string name="vpn_settings_summary" msgid="8849924181594963972">"VPNの設定と管理"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"VPNを設定および管理する"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"（変更なし）"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"（未設定）"</string>
     <string name="credentials_category" msgid="8536992056377271234">"認証情報ストレージ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5154a4384a1..2dc30a04322 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -596,7 +596,7 @@
     <string name="restore_default_apn" msgid="2724583218635739913">"기본 APN 설정 복원 중"</string>
     <string name="menu_restore" msgid="8260067415075573273">"초기화"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"기본 APN 설정을 초기화했습니다."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"초기화"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"공장 초기화"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"휴대전화의 모든 데이터 지우기"</string>
     <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"휴대전화의 "<b>"내부 저장소"</b>"에서 "\n\n<li>"Google 계정"</li>\n<li>"시스템과 애플리케이션의 데이터 및 설정"</li>\n<li>"다운로드한 애플리케이션"</li>\n\n" 등을 비롯한 모든 데이터가 지워집니다. 휴대전화의 모든 데이터를 지우려면 "<b>"USB 저장소"</b>"를 지워야 합니다."\n\n</string>
     <string name="master_clear_desc" product="default" msgid="1741944496458365969">"휴대전화의 "<b>"내부 저장소"</b>"에서 "\n\n<li>"Google 계정"</li>\n<li>"시스템과 애플리케이션의 데이터 및 설정"</li>\n<li>"다운로드한 애플리케이션"</li>\n\n" 등을 비롯한 모든 데이터가 지워집니다. 음악, 사진 및 기타 사용자 데이터도 지우려면 "<b>"SD 카드"</b>"를 지워야 합니다."\n\n</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 170d87cc1fd..d9653ed3909 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1134,8 +1134,8 @@
     <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Ostrzeżenie dotyczące systemów szyfrowania plików"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sygnał alarmowy"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Skonfiguruj sposób działania w przypadku połączenia alarmowego"</string>
-    <string name="privacy_settings" msgid="9206631214140954954">"Prywatność"</string>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Ustawienia prywatności"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Dane użytkownika"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Ustawienia danych"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Tworzenie i przywracanie kopii zapasowej"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dane osobiste"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Utwórz kopię zapasową moich danych"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d28d3ed9c85..aabcc77d881 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -27,7 +27,7 @@
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Получить список PDP"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"В зоне обслуживания"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"Вне зоны обслуживания"</string>
-    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Только экстренный вызов"</string>
+    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Только экстренные вызовы"</string>
     <string name="radioInfo_service_off" msgid="1434084741785525415">"Радио отключено"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Роуминг"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Роуминг отключен"</string>
@@ -536,7 +536,7 @@
     <string name="memory_size" msgid="6629067715017232195">"Всего места"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Извлечь SD-карту"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Отключить внутр. USB-накопитель"</string>
-    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Отключить SD-карту для безопасного извлечения"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Отключение SD-карты для ее безопасного извлечения из устройства"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Вставить USB-накопитель для подключения"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Вставьте SD-карту для подключения"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Подключить USB-накопитель"</string>
@@ -545,8 +545,8 @@
     <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Подключить SD-карту"</string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Очистить USB-накопитель"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Очистить SD-карту"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Удаляет все данные с внутреннего USB-накопителя телефона, такие как музыка и фотографии"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Удаляет все данные с SD-карты телефона, например музыку и фотографии"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Удаление с внутреннего USB-накопителя телефона всех данных, включая музыку и фотографии"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Удаление с SD-карты всех данных, включая музыку и фотографии"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Недоступно"</string>
     <string name="read_only" msgid="6702420168629076340">" (только для чтения)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Отключить USB-накопитель"</string>
@@ -597,12 +597,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"Восстановить настройки по умолчанию"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Восстановление настроек APN по умолчанию завершено"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Сброс настроек"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Удаляет все данные из памяти телефона"</string>
+    <string name="master_clear_summary" msgid="4986154238001088492">"Возврат к заводским настройкам и удаление всех данных из памяти телефона"</string>
     <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Это приведет к удалению всех данных с "<b>"внутреннего накопителя"</b>" телефона, включая:"\n\n<li>"ваш аккаунт Google;"</li>\n<li>"данные и настройки системы и приложений;"</li>\n<li>"загруженные приложения."</li>\n\n"Чтобы удалить все данные с этого телефона, необходимо очистить "<b>"USB-накопитель"</b>"."\n\n</string>
     <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Это приведет к удалению всех данных с "<b>"внутреннего накопителя"</b>" телефона, включая:"\n\n<li>"ваш аккаунт Google;"</li>\n<li>"данные и настройки системы и приложений;"</li>\n<li>"загруженные приложения."</li>\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."\n\n</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Очистить USB-накопитель"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Очистить SD-карту"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Очищать внутренний накопитель."</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Удалить все данные, включая аудио- и фотофайлы, из USB-памяти телефона."</string>
     <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Удаляет все данные на SD-карте телефона, например музыку и фотографии."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Сбросить настройки телефона"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Стереть всю личную информацию и загруженные приложения? Это действие нельзя отменить!"</string>
@@ -613,7 +613,7 @@
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Очистить USB-накопитель"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Очистить SD-карту"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Уничтожает все данные на USB-накопителе"</string>
-    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Удаляет все данные с карты SD"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Удаление всех данных с SD-карты"</string>
     <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Это приведет к очистке USB-накопителя. Вы потеряете "<b>"все"</b>" хранящиеся на нем данные!"</string>
     <string name="media_format_desc" product="default" msgid="1598627584181935513">"Это приведет к очистке SD-карты. Вы потеряете "<b>"все"</b>" данные на карте!"</string>
     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Очистить USB-накопитель"</string>
@@ -791,7 +791,7 @@
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Использование памяти"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Проверьте, сколько места в памяти устройства занимают различные приложения"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Работающие приложения"</string>
-    <string name="runningservices_settings_summary" msgid="854608995821032748">"Просмотр и управление работающими программами"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Просмотр и управление работающими приложениями"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Перезапуск"</string>
     <string name="cached" msgid="1059590879740175019">"Кэшированный фоновый процесс"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Ничего не запущено."</string>
@@ -1134,14 +1134,14 @@
     <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Предупреждение для зашифрованных файловых систем"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тональный сигнал экстренного вызова"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Настроить режим работы при экстренном вызове"</string>
-    <string name="privacy_settings" msgid="9206631214140954954">"Конфиденциальность"</string>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Настройки конфиденциальности"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Восстановление и сброс"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Восстановление данных и настроек"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Резервное копирование и восстановление"</string>
-    <string name="personal_data_section_title" msgid="7815209034443782061">"Личные данные"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Возврат к заводским настройкам"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Резервное копирование данных"</string>
-    <string name="backup_data_summary" msgid="6515285107793232815">"Резервное копирование данных приложений, паролей Wi-Fi и других настроек в Google"</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Сохранять резервные копии данных приложений, паролей точек доступа Wi-Fi и настроек на серверах Google"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автовосстановление"</string>
-    <string name="auto_restore_summary" msgid="83177150536734378">"При переустановке приложения восстановить резервные копии настроек и других данных"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"При переустановке приложений автоматически восстанавливать данные и настройки из резервных копий"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Резервное копирование"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Вы уверены, что хотите прекратить создавать резервные копии паролей Wi-Fi, закладок, настроек и данных приложений и удалить все копии с серверов Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Настройки администрирования устройства"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 26b34d6f571..57672708ddc 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1122,7 +1122,7 @@
     <string name="credentials_erased" msgid="7700309135582200849">"Shramba poverilnic je izbrisana."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Shramba poverilnic je omogočena."</string>
     <string name="credentials_disabled" msgid="7453188089059045380">"Shramba poverilnic je onemogočena."</string>
-    <!-- outdated translation 5563670455056905298 -->     <string name="encrypted_fs_category" msgid="1841367653663913956">"Šifrirni datotečni sistem"</string>
+    <!-- outdated translation 5563670455056905298 -->     <string name="encrypted_fs_category" msgid="1841367653663913956">"Šifrirani datotečni sistem"</string>
     <!-- outdated translation 1460957282314335666 -->     <string name="encrypted_fs_enable" msgid="3884033081603327729">"Šifriranje zasebnih podatkov uporabnikov"</string>
     <!-- outdated translation 1350828979802222331 -->     <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Omogoči shranjevanje zasebnih podatkov uporabnikov te naprave s šifrirnim datotečnim sistemom"</string>
     <!-- outdated translation 5616902699813992220 -->     <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Če želite omogočiti šifrirni datotečni sistem, je treba izbrisati podatke v napravi."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9b997857282..e7e4b1db5b1 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -453,7 +453,7 @@
     <string name="dock_settings_title" msgid="9161438664257429372">"Dockningsinställningar"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Ljud"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Inställningar för ansluten skrivbordsdocka"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Inställningar för ansluten bildocka"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Inställningar för dockningsstation för bil"</string>
     <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefonen är inte dockad"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Inställningar för ansluten dockningsenhet"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Ingen dockningsenhet hittades"</string>
diff --git a/tests/res/values-ru/strings.xml b/tests/res/values-ru/strings.xml
index c0378b55238..c9fd9c61d0d 100644
--- a/tests/res/values-ru/strings.xml
+++ b/tests/res/values-ru/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="3169265480789026010">"Видимый"</string>
+    <string name="discoverable" msgid="3169265480789026010">"Видимость"</string>
     <string name="start_scan" msgid="6035699220942169744">"Начать поиск"</string>
     <string name="stop_scan" msgid="527546916633745779">"Остановить поиск"</string>
 </resources>

From aba8cc88cc62ef8875075a49653f4a4998581f5f Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Mon, 14 Feb 2011 17:25:07 -0800
Subject: [PATCH 3/6] Import revised translations.  DO NOT MERGE

Change-Id: I8e7d2652c85f2bd516881e11283af62ee760adb1
---
 res/values-cs/arrays.xml      |  2 +-
 res/values-it/strings.xml     |  4 +-
 res/values-ja/arrays.xml      |  6 +--
 res/values-ja/strings.xml     | 72 +++++++++++++++++------------------
 res/values-nl/strings.xml     |  2 +-
 res/values-pl/strings.xml     |  2 +-
 res/values-ru/strings.xml     | 46 +++++++++++-----------
 res/values-sv/arrays.xml      |  2 +-
 res/values-sv/strings.xml     | 56 +++++++++++++--------------
 res/values-zh-rTW/strings.xml |  4 +-
 10 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 00e605eb442..f61fbb381ea 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -45,7 +45,7 @@
     <item msgid="7589406073232279088">"1 minuta"</item>
     <item msgid="7001195990902244174">"2 minuty"</item>
     <item msgid="5721688686241190620">"10 minut"</item>
-    <item msgid="7156442995039264948">"30 min."</item>
+    <item msgid="7156442995039264948">"30 minut"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Velmi pomalá"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8856447fd8e..75320581015 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -981,7 +981,7 @@
     <string name="tts_settings" msgid="8186971894801348327">"Impostazioni di sintesi vocale"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Impostazioni di sintesi vocale"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usa sempre mie imp."</string>
-    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Le impostazioni predefinite hanno priorità sul quelle delle applicazioni"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Le impostazioni predefinite hanno priorità su quelle delle applicazioni"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Impostazioni predefinite"</string>
     <string name="tts_default_synth_title" msgid="29467896463371992">"Motore predefinito"</string>
     <string name="tts_default_synth_summary" msgid="6482936537135251690">"Imposta il motore di sintesi vocale per l\'uso con testo parlato"</string>
@@ -1134,7 +1134,7 @@
     <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Avviso file system crittografati."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono chiamate emergenza"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Imposta il comportamento in caso di chiamata di emergenza"</string>
-    <string name="privacy_settings" msgid="9206631214140954954">"Backup e ripristino"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Privacy"</string>
     <string name="privacy_settings_title" msgid="1987089301293213705">"Impostazioni privacy"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Backup e ripristino"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dati personali"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 7a749f64b9b..e1eff4cfbc7 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -37,7 +37,7 @@
   <string-array name="animations_summaries">
     <item msgid="4569165952409350897">"ウィンドウアニメーションを表示しない"</item>
     <item msgid="4460915688877708508">"一部のウィンドウアニメーションを表示する"</item>
-    <item msgid="488968798204105119">"すべてのウィンドウアニメーションを表示"</item>
+    <item msgid="488968798204105119">"すべてのウィンドウアニメーションを表示する"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15秒"</item>
@@ -151,7 +151,7 @@
   <string-array name="vibrate_entries">
     <item msgid="3388952299521009213">"常に使用"</item>
     <item msgid="6293147072807231256">"なし"</item>
-    <item msgid="1276641209451816572">"マナーモードがオンのときのみ"</item>
-    <item msgid="8418930333779132418">"マナーモードがオフのときのみ"</item>
+    <item msgid="1276641209451816572">"マナーモードがONのときのみ"</item>
+    <item msgid="8418930333779132418">"マナーモードがOFFのときのみ"</item>
   </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2e11d416145..d23407c1b48 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -19,8 +19,8 @@
     <string name="yes" msgid="4676390750360727396">"はい"</string>
     <string name="no" msgid="6731231425810196216">"いいえ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
-    <string name="turn_on_radio" msgid="8706561489788373676">"無線通信をオン"</string>
-    <string name="turn_off_radio" msgid="1820294552893884115">"無線通信をオフ"</string>
+    <string name="turn_on_radio" msgid="8706561489788373676">"無線通信をON"</string>
+    <string name="turn_off_radio" msgid="1820294552893884115">"無線通信をOFF"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIMのアドレス帳を表示"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"発信番号制限を表示"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"サービス電話番号を表示"</string>
@@ -28,7 +28,7 @@
     <string name="radioInfo_service_in" msgid="1915416319177520020">"使用中"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"休止中または使用不可"</string>
     <string name="radioInfo_service_emergency" msgid="2485604591272668370">"緊急通報のみ"</string>
-    <string name="radioInfo_service_off" msgid="1434084741785525415">"無線通信をオフ"</string>
+    <string name="radioInfo_service_off" msgid="1434084741785525415">"無線通信をOFF"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"ローミング"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"ローミングなし"</string>
     <string name="radioInfo_phone_idle" msgid="7489244938838742820">"アイドル"</string>
@@ -226,12 +226,12 @@
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"ONにする"</string>
     <string name="roaming_warning" msgid="1269870211689178511">"ローミングにより高額な通信料が発生することがあります。データローミングを許可しますか？"</string>
     <string name="roaming_reenable_title" msgid="7626425894611573131">"注意"</string>
-    <string name="networks" msgid="6333316876545927039">"オペレーターの選択"</string>
-    <string name="sum_carrier_select" msgid="6648929373316748020">"ネットワークオペレーターを選択します"</string>
+    <string name="networks" msgid="6333316876545927039">"通信事業者の選択"</string>
+    <string name="sum_carrier_select" msgid="6648929373316748020">"通信事業者を選択する"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日付と時刻"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"日付、時刻、タイムゾーンの設定"</string>
     <string name="date_time_auto" msgid="3086083265745944725">"自動"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"ネットワーク自動設定"</string>
+    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"ネットワークから設定を取得する"</string>
     <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"ネットワーク自動設定"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24時間表示"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"時刻設定"</string>
@@ -328,8 +328,8 @@
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"メディアの音声に使用"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"携帯電話の音声に使用"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ファイル転送に使用"</string>
-    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ドックの設定"</string>
-    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"音声にドックを使用"</string>
+    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ホルダーの設定"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"音声をホルダーに出力"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"スピーカーフォン"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"音楽とメディア"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"設定を保存"</string>
@@ -434,7 +434,7 @@
     <string name="media_volume_title" msgid="3576565767317118106">"メディア"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"音楽や動画の再生音量"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"アラーム"</string>
-    <string name="dock_settings_summary" msgid="455802113668982481">"付属のドックの音声設定"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"装着したホルダーの音声を設定する"</string>
     <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"タッチ操作音"</string>
     <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"ダイヤルパッドの操作音をONにする"</string>
     <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"ダイヤルパッドの操作音をONにする"</string>
@@ -449,16 +449,16 @@
     <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"ソフトキー操作や特定のUI操作でのバイブレーションをONにする"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"ノイズキャンセル"</string>
     <string name="audio_record_proc_summary" msgid="8113628457499616498">"通話中や録音中に周囲のノイズを抑えます。"</string>
-    <string name="dock_settings" msgid="1820107306693002541">"ドック"</string>
-    <string name="dock_settings_title" msgid="9161438664257429372">"ドックの設定"</string>
+    <string name="dock_settings" msgid="1820107306693002541">"ホルダー"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"ホルダーの設定"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"音声"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"付属のデスクトップホルダーの設定"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"付属のカーホルダーの設定"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"電話が固定されていません"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"付属のドックの設定"</string>
-    <string name="dock_not_found_title" msgid="3290961741828952424">"ドックが見つかりません"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"ドックの音声を設定するには携帯電話をドックに固定する必要があります"</string>
-    <string name="dock_sounds_enable_title" msgid="3659084028644948905">"ホルダー装着時の音"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"装着した卓上ホルダーを設定する"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"装着したカーホルダーを設定する"</string>
+    <string name="dock_audio_summary_none" msgid="289909253741048784">"端末が装着されていません"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"装着したホルダーを設定する"</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"ホルダーが見つかりません"</string>
+    <string name="dock_not_found_text" msgid="3035260358985111855">"ホルダーの音声を設定するには携帯端末をホルダーに装着する必要があります"</string>
+    <string name="dock_sounds_enable_title" msgid="3659084028644948905">"ホルダー脱着時の音"</string>
     <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"携帯のホルダー脱着時に音を鳴らす"</string>
     <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"携帯のホルダー脱着時に音を鳴らさない"</string>
     <string name="sync_settings" msgid="9186125469300013491">"アカウントと同期"</string>
@@ -474,8 +474,8 @@
     <string name="accelerometer_summary_off" msgid="5485489363715740761">"画面の向きに合わせて縦横表示を切り替える"</string>
     <string name="brightness" msgid="2354961343555249270">"画面の明るさ"</string>
     <string name="brightness_summary" msgid="838917350127550703">"画面の明るさを調整する"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"バックライト消灯"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"画面バックライトを自動消灯するまでの時間を設定する"</string>
+    <string name="screen_timeout" msgid="4882669461447531301">"画面消灯"</string>
+    <string name="screen_timeout_summary" msgid="2905757633140605334">"画面を自動消灯するまでの時間を設定する"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIMカードロック設定"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIMカードロック設定"</string>
@@ -545,7 +545,7 @@
     <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"SDカードをマウント"</string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USBストレージ内データを消去"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SDカード内データを消去"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"内部USBストレージ内の全データ（音楽、写真など）を消去します。"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"内部USBストレージ内の全データ（音楽、写真など）の消去"</string>
     <string name="sd_format_summary" product="default" msgid="915849621390821841">"SDカード内の全データ（音楽、写真など）の消去"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"使用不可"</string>
     <string name="read_only" msgid="6702420168629076340">" （読み取り専用）"</string>
@@ -597,12 +597,12 @@
     <string name="menu_restore" msgid="8260067415075573273">"初期設定にリセット"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"APN設定をリセットしました"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"データの初期化"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"携帯電話内のすべてのデータを消去"</string>
+    <string name="master_clear_summary" msgid="4986154238001088492">"携帯端末内のすべてのデータを消去する"</string>
     <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"この操作を行うと、携帯端末の"<b>"内部ストレージ"</b>"から次のデータがすべて消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムとアプリケーションのデータと設定"</li>\n<li>"ダウンロードされたアプリケーション"</li>\n\n"端末上のすべてのデータを削除するには、"<b>"USBストレージ"</b>"内のデータを消去する必要があります。"\n\n</string>
     <string name="master_clear_desc" product="default" msgid="1741944496458365969">"この操作を行うと、携帯端末の"<b>"内部ストレージ"</b>"から次のデータがすべて消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムとアプリケーションのデータと設定"</li>\n<li>"ダウンロードされたアプリケーション"</li>\n\n"音楽や写真などユーザーデータも削除するには、"<b>"SDカード"</b>"内のデータを消去する必要があります。"\n\n</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USBストレージ内データの消去"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SDカード内データを消去"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"内部USBストレージ内の全データ（音楽、写真など）を消去します。"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"内部USBストレージ内の全データ（音楽、写真など）を消去する"</string>
     <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"SDカード内の全データ（音楽、写真など）を消去します。"</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"携帯電話をリセット"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"個人情報とダウンロードしたアプリケーションをすべて削除しますか？この操作を元に戻すことはできません。"</string>
@@ -644,11 +644,11 @@
     <string name="network_settings_summary" msgid="5149750850846813553">"ローミング、ネットワーク、APNを設定する"</string>
     <string name="location_title" msgid="1029961368397484576">"現在地"</string>
     <string name="location_network_based" msgid="8815705866861993344">"無線ネットワークを使用"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"無線ネットワーク使用のアプリケーション（地図など）で位置を表示する"</string>
+    <string name="location_networks_disabled" msgid="2708968452901433980">"地図などのアプリケーションで無線ネットワークの位置情報を使用する"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Wi-Fi/モバイルネットワークで位置を検出する"</string>
     <string name="location_gps" msgid="6296125378829097831">"GPS機能を使用"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"高精度測位"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"高精度測位（電池消費増、電波が良好な場所で使用）"</string>
+    <string name="location_street_level" msgid="7456259025474443314">"高精度測位を実行する"</string>
+    <string name="location_gps_disabled" msgid="6632537158777308128">"高精度測位を実行する（電池消費量増、屋外で使用する）"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"A-GPSを使用"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"サーバーでGPSを補助します（OFFにするとネットワーク使用率が減少します）"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"サーバーでGPSを補助します（OFFにするとGPS性能が向上します）"</string>
@@ -738,7 +738,7 @@
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"設定されていません。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"設定を消去"</string>
     <string name="unknown" msgid="1592123443519355854">"不明"</string>
-    <string name="sort_order_alpha" msgid="1410278099123670628">"名前順に表示する"</string>
+    <string name="sort_order_alpha" msgid="1410278099123670628">"名前順"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"サイズ順"</string>
     <string name="show_running_services" msgid="5736278767975544570">"実行中のサービスを表示"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"キャッシュしたプロセスを表示"</string>
@@ -803,10 +803,10 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
-    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>のサービス"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>のサービス"</string>
-    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>のサービス"</string>
-    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>のサービス"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>個のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>個のサービス"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>個のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>個のサービス"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>個のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>個のサービス"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>個のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>個のサービス"</string>
     <string name="runningservicedetails_settings_title" msgid="6188692418986988288">"実行中のアプリケーション"</string>
     <string name="no_services" msgid="7133900764462288263">"アクティブなサービスはありません"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"サービス"</string>
@@ -864,7 +864,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"文字入力"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"テキスト入力オプションを管理"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>の設定"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"画面キーボードの設定"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"画面キーボードを設定する"</string>
     <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"端末内蔵キーボード"</string>
     <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"端末内蔵物理キーボードの設定"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"開発"</string>
@@ -953,7 +953,7 @@
     <string name="battery_desc_radio" msgid="5479196477223185367">"セル無線通信の電池使用量"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"電波が届かない場所では機内モードに切り替えて電池を節約します。"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"ディスプレイとバックライトの電池使用量"</string>
-    <string name="battery_sugg_display" msgid="3370202402045141760">"画面の明るさを下げたりバックライト消灯までの時間を短くしたりします"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"画面の明るさを下げたり画面消灯までの時間を短くしたりします"</string>
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fiの電池使用量"</string>
     <string name="battery_sugg_wifi" msgid="7542345142282261691">"未使用時または電波が届かないときはWi-FiをOFFにします"</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Bluetoothの電池使用量"</string>
@@ -1134,14 +1134,14 @@
     <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"暗号化ファイルシステムの警告。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急時の音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"緊急通報時の動作を設定します"</string>
-    <string name="privacy_settings" msgid="9206631214140954954">"プライバシー"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"バックアップと復元"</string>
     <string name="privacy_settings_title" msgid="1987089301293213705">"プライバシーの設定"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"バックアップと復元"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"個人データ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"データのバックアップ"</string>
-    <string name="backup_data_summary" msgid="6515285107793232815">"アプリケーションデータ、Wi-Fiパスワード、その他の設定をGoogleサーバーにバックアップします。"</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"アプリケーションデータ、Wi-Fiパスワード、その他の設定をGoogleサーバーにバックアップする"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自動復元"</string>
-    <string name="auto_restore_summary" msgid="83177150536734378">"バックアップ済みの設定やその他のデータをアプリケーションの再インストール時に復元します"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"バックアップ済みの設定やその他のデータをアプリケーションの再インストール時に復元する"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"バックアップ"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Wi-Fiパスワード、ブックマーク、その他の設定とアプリケーションデータのバックアップを停止し、Googleサーバー上のすべてのコピーを消去してよろしいですか？"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"デバイス管理の設定"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 51fb3770e07..8668373097d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1134,7 +1134,7 @@
     <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Waarschuwing voor gecodeerde bestandssystemen."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Toon voor noodoproep"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Gedrag bij noodoproepen instellen"</string>
-    <string name="privacy_settings" msgid="9206631214140954954">"Privacy"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Back-up &amp; herstellen"</string>
     <string name="privacy_settings_title" msgid="1987089301293213705">"Privacyinstellingen"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Back-up maken en terugzetten"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Persoonlijke gegevens"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d9653ed3909..4b27f9c94a2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -625,7 +625,7 @@
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Aby potwierdzić zamiar wyczyszczenia nośnika USB, musisz narysować wzór odblokowania."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Aby potwierdzić zamiar wyczyszczenia karty SD, musisz narysować wzór odblokowania."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ustawienia połączeń"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"Poczta głosowa, przekierowania połączeń, poł. oczekujące, ID rozmówcy"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"Poczta głosowa, przekazywanie połączeń, poł. oczekujące, ID rozmówcy"</string>
     <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tethering"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Przenośny punkt dostępu"</string>
     <string name="tether_settings_title_both" msgid="2734066355556891504">"Tethering i przenośny punkt dostępu"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index aabcc77d881..e4a7c8eaeca 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -334,7 +334,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музыки и мультимедиа"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомнить настройки"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"Включить NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Использовать радиосвязь ближнего действия для чтения и обмена метками"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Использовать радиосвязь ближнего действия для чтения и обмена тегами"</string>
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Произошла ошибка."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Включить Wi-Fi"</string>
@@ -342,7 +342,7 @@
     <string name="wifi_settings_category" msgid="2810363951104753710">"Настройки Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Настройка и управление точками доступа беспроводной сети"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Включение..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Выключение..."</string>
+    <string name="wifi_stopping" msgid="5952909472548218348">"Отключение..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Ошибка"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"В режиме полета"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Не удалось выполнить поиск сети"</string>
@@ -373,7 +373,7 @@
     <string name="wifi_unspecified" msgid="5431501214192991253">"(не указано)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Сохранено в памяти"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Отключено"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Вне диапазона"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Недоступна"</string>
     <string name="wifi_secured" msgid="6759903183748011566">"Защищено с помощью <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, защищено с помощью <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Подключить"</string>
@@ -381,9 +381,9 @@
     <string name="wifi_save" msgid="3331121567988522826">"Сохранить"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Отмена"</string>
     <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Дополнительные функции"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Управляющий домен"</string>
+    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Диапазон частот"</string>
     <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Настроить количество используемых каналов"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"При установке управляющего домена возникла неполадка."</string>
+    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"При установке диапазона частот возникла неполадка."</string>
     <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"каналов: <xliff:g id="NUM_CHANNELS">%1$d</xliff:g>"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Спящий режим"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"При каких условиях переключаться с Wi-Fi на сотовую сеть"</string>
@@ -453,7 +453,7 @@
     <string name="dock_settings_title" msgid="9161438664257429372">"Настройки док-станции"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Аудио"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Настройки подключенной настольной док-станции"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Настройки подключенной автомобильной док-станции"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Настройки док-станции автомобиля"</string>
     <string name="dock_audio_summary_none" msgid="289909253741048784">"Телефон не подключен к док-станции"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Настройки подключенной док-станции"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Док-станция не найдена."</string>
@@ -641,7 +641,7 @@
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Ошибка подключения USB"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Справка"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобильная сеть"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"Настроить параметры роуминга, сетей, точек доступа (APN)"</string>
+    <string name="network_settings_summary" msgid="5149750850846813553">"Настройка параметров роуминга, сетей и точек доступа (APN)"</string>
     <string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Беспроводные сети"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Использовать Wi-Fi и сотовые сети для определения местоположения"</string>
@@ -789,7 +789,7 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Место установки"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Изменить установочную папку для новых приложений."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Использование памяти"</string>
-    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Проверьте, сколько места в памяти устройства занимают различные приложения"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Объем памяти, занимаемый различными приложениями"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Работающие приложения"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Просмотр и управление работающими приложениями"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Перезапуск"</string>
@@ -873,8 +873,8 @@
     <string name="enable_adb_summary" msgid="4881186971746056635">"Включить режим отладки при подключении к компьютеру по USB"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Оставить включенным"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Во время зарядки экран будет всегда включен"</string>
-    <string name="allow_mock_location" msgid="2787962564578664888">"Отладка местоположения"</string>
-    <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить получение отладочных данных о местоположении"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Фиктивные местоположения"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить использование фиктивных местоположений"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Разрешить отладку USB?"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"Отладка по USB предназначена для целей разработки. С ее помощью можно копировать данные с компьютера на мобильное устройство и наборот, устанавливать на устройство приложения и просматривать данные журналов."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Выбор·гаджета"</string>
@@ -990,7 +990,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Тон"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Влияет на высоту синтезированной речи"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Язык"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Установить в зависимости от языка голос для чтения текста"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Выбор языка для чтения текста"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Прослушать пример"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Воспроизвести краткую демонстрацию синтезированной речи"</string>
     <string name="tts_install_data_title" msgid="4264378440508149986">"Установка голосовых данных"</string>
@@ -1052,7 +1052,7 @@
     <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Связь с сервером не установлена. Возможно, не были согласованы параметры шифрования. Изменить настройки шифрования?"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"Добавить VPN"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Добавить VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Добавить VPN \"<xliff:g id="NAME">%s</xliff:g>\""</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Добавить <xliff:g id="NAME">%s</xliff:g> VPN"</string>
     <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Сведения: <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="vpns" msgid="3148141862835492816">"Сети VPN"</string>
     <string name="vpn_connecting" msgid="8039521381692090116">"Подключение..."</string>
@@ -1063,33 +1063,33 @@
     <string name="vpn_a_name" msgid="8445736942405283509">"имя VPN"</string>
     <string name="vpn_profile_added" msgid="9061017910337129840">"Профиль \"<xliff:g id="NAME">%s</xliff:g>\" добавлен"</string>
     <string name="vpn_profile_replaced" msgid="587435576816273815">"В профиль \"<xliff:g id="NAME">%s</xliff:g>\" внесены изменения"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Установить СП"</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Сертификат пользователя"</string>
     <string name="vpn_user_certificate" msgid="949322691686938888">"Сертификат пользователя"</string>
     <string name="vpn_a_user_certificate" msgid="8943983437956898649">"сертификат пользователя"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Установить СЦС"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Сертификат ЦС"</string>
     <string name="vpn_ca_certificate" msgid="465085144064264742">"Сертификат центра сертификации"</string>
     <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"сертификат центра сертификации"</string>
     <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Установить ключ L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"ключ L2TP"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Ключ L2TP"</string>
     <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"ключ L2TP"</string>
     <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"шифрование"</string>
     <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Шифрование PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Установить совместно используемый ключ IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Совместно используемый ключ IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"совместно используемый ключ IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Укажите сервер VPN"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Общий ключ IPSec"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Общий ключ IPSec"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"общий ключ IPSec"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Cервер VPN"</string>
     <string name="vpn_vpn_server" msgid="1141754908824209260">"Сервер VPN"</string>
     <string name="vpn_a_vpn_server" msgid="5960906152125045853">"сервер VPN"</string>
     <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Имя сервера VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Домены поиска DNS"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS-суффиксы"</string>
     <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS поиска"</string>
     <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> установлено"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> не установлено"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> — не установлено"</string>
     <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> не установлено (необязательно)"</string>
     <string name="vpn_enable_field" msgid="3700967675854517191">"Включить <xliff:g id="OPTION">%s</xliff:g>"</string>
     <string name="vpn_disable_field" msgid="6905658811179634005">"Отключить <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> вкл."</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> откл."</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> – включено"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> – отключено"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Настройки VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Настройка и управление виртуальными частными сетями (VPN)"</string>
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(не изменялось)"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 2d2949a109d..4b1bfafefe4 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -118,7 +118,7 @@
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Användningstid"</item>
     <item msgid="1908750532762193304">"Starta räkneverk"</item>
-    <item msgid="1213951670006606353">"Namn på program"</item>
+    <item msgid="1213951670006606353">"Namn på app"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e7e4b1db5b1..4c22016ec69 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -113,9 +113,9 @@
     <string name="bluetooth_notif_message" msgid="5381418499788668724">"Välj att parkoppla med "</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth-enhetsväljare"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Begäran om Bluetooth-behörighet"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Ett program i telefonen begär tillåtelse att aktivera Bluetooth. Vill du tillåta det?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Ett program i telefonen begär tillåtelse att göra telefonen synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Ett program i telefonen begär tillåtelse att aktivera Bluetooth och göra telefonen synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"En app i telefonen begär tillåtelse att aktivera Bluetooth. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"En app i telefonen begär tillåtelse att göra telefonen synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"En app i telefonen begär tillåtelse att aktivera Bluetooth och göra telefonen synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Aktiverar Bluetooth …"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Inställningar för datum och tid"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"Kl. 13:00"</string>
@@ -551,8 +551,8 @@
     <string name="read_only" msgid="6702420168629076340">" (Skrivskyddad)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Demontera USB-enhet"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Montera bort SD-kort"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Om du demonterar USB-lagringsenheten avbryts några av de program som körs och de kanske inte blir tillgängliga igen förrän du monterar tillbaka USB-enheten."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Om du monterar bort SD-kortet avbryts några av de program som körs och de kanske inte blir tillgängliga igen förrän du monterar tillbaka SD-kortet."</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Om du demonterar USB-lagringsenheten avbryts några av de appar som körs och de kanske inte blir tillgängliga igen förrän du monterar tillbaka USB-enheten."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Om du monterar bort SD-kortet avbryts några av de appar som körs och de kanske inte blir tillgängliga igen förrän du monterar tillbaka SD-kortet."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"USB-enheten har ej demonterats"</string>
     <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Det gick inte att montera bort SD-kort"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Det går inte att demontera USB-lagringsenheten. Försök igen senare."</string>
@@ -605,7 +605,7 @@
     <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Radera alla data på telefonens interna USB-lagring, som musik och foton."</string>
     <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Radera alla data på telefonens SD-kort, som musik och foton."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Återställ telefonen"</string>
-    <string name="master_clear_final_desc" msgid="6917971132484622696">"Vill du ta bort all personlig information och alla hämtade program? Det går inte att ångra åtgärden!"</string>
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Vill du ta bort all personlig information och alla hämtade appar? Det går inte att ångra åtgärden!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Radera allt"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Rita ditt grafiska lösenord"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Du måste rita ditt grafiska lösenord om du vill återställa telefonen."</string>
@@ -711,11 +711,11 @@
     <string name="lock_example_message" msgid="1838650097090632706">"Anslut minst fyra punkter."\n" "\n"Tryck på Nästa när du vill rita ditt eget grafiska lösenord."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Hantera appar"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Hantera och ta bort installerade appar"</string>
-    <string name="applications_settings" msgid="3736173521008476946">"Program"</string>
+    <string name="applications_settings" msgid="3736173521008476946">"Appar"</string>
     <string name="applications_settings_summary" msgid="2714215108369119717">"Hantera appar, ställ in genvägar för snabbstart"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"Programinställningar"</string>
     <string name="install_applications" msgid="4872012136210802181">"Okända källor"</string>
-    <string name="install_unknown_applications" msgid="6612824788917283662">"Tillåt installation av program som inte finns i Market"</string>
+    <string name="install_unknown_applications" msgid="6612824788917283662">"Tillåt installation av appar som inte finns i Market"</string>
     <string name="install_all_warning" msgid="1923717607319933741">"Din telefon och dina personliga uppgifter är mer känsliga för hot från program från okända källor. Du godkänner att du själv är ansvarig för eventuella skador på din telefon eller förlust av data som kan uppstå när du använder dessa program."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Programinformation"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
@@ -727,14 +727,14 @@
     <string name="controls_label" msgid="7611113077086853799">"Kontroller"</string>
     <string name="force_stop" msgid="7435006169872876756">"Tvingad avslutning"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Totalt"</string>
-    <string name="application_size_label" msgid="5055196275624686382">"Program"</string>
+    <string name="application_size_label" msgid="5055196275624686382">"App"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Avinstallera"</string>
     <string name="disable_text" msgid="6544054052049395202">"Inaktivera"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktivera"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Rensa data"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Avinstallera uppdateringar"</string>
-    <string name="auto_launch_enable_text" msgid="2630656657744196691">"Du har valt att starta detta program som standard för vissa åtgärder."</string>
+    <string name="auto_launch_enable_text" msgid="2630656657744196691">"Du har valt att starta denna app som standard för vissa åtgärder."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Inga standardinställningar har angetts."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Rensa standardinställn."</string>
     <string name="unknown" msgid="1592123443519355854">"Okänd"</string>
@@ -751,7 +751,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
     <string name="disabled" msgid="9206776641295849915">"Inaktiverat"</string>
-    <string name="no_applications" msgid="5190227407135243904">"Inga program."</string>
+    <string name="no_applications" msgid="5190227407135243904">"Inga appar."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortslagring"</string>
@@ -761,7 +761,7 @@
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Avbryt"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Programmet hittades inte"</string>
-    <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Programmet fanns inte med i listan över installerade program."</string>
+    <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Appen fanns inte med i listan över installerade appar."</string>
     <string name="clear_data_failed" msgid="581956197586913865">"Det gick inte att rensa programdata."</string>
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Avinstallera uppdateringar"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Vill du avinstallera alla uppdateringar av det här Android-programmet?"</string>
@@ -783,19 +783,19 @@
     <string name="invalid_location" msgid="4934491353200240499">"Den angivna installationsplatsen är inte giltig."</string>
     <string name="system_package" msgid="1030561474413022831">"Det går inte att installera systemuppdateringar på externa media."</string>
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Tvingad avslutning"</string>
-    <string name="force_stop_dlg_text" msgid="5157374701213502922">"Om du tvingar ett program att avslutas kan det uppstå fel. Är du säker?"</string>
-    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Flytta program"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Det gick inte att flytta program. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="force_stop_dlg_text" msgid="5157374701213502922">"Om du tvingar en app att avslutas kan det uppstå fel. Är du säker?"</string>
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Flytta appen"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Det gick inte att flytta appar. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Önskad installationsplats"</string>
-    <string name="app_install_location_summary" msgid="879753854530300436">"Ändra önskad installationsplats för nya program."</string>
+    <string name="app_install_location_summary" msgid="879753854530300436">"Ändra önskad installationsplats för nya appar."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Använt utrymme"</string>
-    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Visa lagring som används av program"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Visa lagring som används av appar"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktiva tjänster"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Visa och styr aktiva tjänster"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Startar om"</string>
     <string name="cached" msgid="1059590879740175019">"Cachade bakgrundsprocesser"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Inget körs."</string>
-    <string name="service_started_by_app" msgid="6575184738671598131">"Startades av ett program."</string>
+    <string name="service_started_by_app" msgid="6575184738671598131">"Startades av en app."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
     <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> led."</string>
@@ -807,7 +807,7 @@
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process och <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjänster"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processer och <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjänst"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processer och <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjänster"</string>
-    <string name="runningservicedetails_settings_title" msgid="6188692418986988288">"Program som körs"</string>
+    <string name="runningservicedetails_settings_title" msgid="6188692418986988288">"App som körs"</string>
     <string name="no_services" msgid="7133900764462288263">"Inte aktiv"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Tjänster"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Processer"</string>
@@ -851,15 +851,15 @@
     <string name="testing_phone_info" msgid="8656693364332840056">"Telefoninformation"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Batteriinformation"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Snabbstart"</string>
-    <string name="quick_launch_summary" msgid="3453825712466417452">"Ställ in kortkommandon för att starta program"</string>
-    <string name="quick_launch_assign_application" msgid="4521368464929956350">"Tilldela program"</string>
+    <string name="quick_launch_summary" msgid="3453825712466417452">"Ställ in kortkommandon för att starta appar"</string>
+    <string name="quick_launch_assign_application" msgid="4521368464929956350">"Tilldela app"</string>
     <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Ingen genväg"</string>
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"Sök + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Rensa"</string>
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Din genväg för <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>(<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) rensas."</string>
     <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Avbryt"</string>
-    <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Program"</string>
+    <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Appar"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Genvägar"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Textinmatning"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Hantera textinmatningsalternativ"</string>
@@ -876,7 +876,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ska USB-felsökning tillåtas?"</string>
-    <string name="adb_warning_message" msgid="5352555112049663033">"USB-felsökning ska endast användas i utvecklingssyfte. Felsökningen kan användas för att kopiera data mellan datorn och enheten, installera program på enheten utan avisering och läsa loggdata."</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"USB-felsökning ska endast användas i utvecklingssyfte. Felsökningen kan användas för att kopiera data mellan datorn och enheten, installera appar på enheten utan avisering och läsa loggdata."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Välj gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Välj widget"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
@@ -886,7 +886,7 @@
     <string name="usage_stats_label" msgid="5890846333487083609">"Användningsstatistik"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Användningsstatistik"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortera efter"</string>
-    <string name="app_name_label" msgid="2000949925256858308">"Program"</string>
+    <string name="app_name_label" msgid="2000949925256858308">"App"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Räkneverk"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Användningstid"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Tillgänglighet"</string>
@@ -897,13 +897,13 @@
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Inga installerade tillgänglighetstjänster."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Tillgänglighetstjänsten kan samla in all text du skriver, inklusive personliga uppgifter som kreditkortsnummer, men inte lösenord. Den kan även logga din kommunikation med användargränssnittet. Den kommer från programmet <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Vill du aktivera tillgänglighetstjänsten?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Vill du inaktivera tillgänglighet?"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Hittade inga tillgänglighetsrelaterade program"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"Du har inga tillgänglighetsrelaterade program installerade."\n\n"Du kan hämta en skärmläsare för enheten från Android Market."\n\n"Klicka på OK om du vill installera skärmläsaren."</string>
+    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Hittade inga tillgänglighetsrelaterade appar"</string>
+    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"Du har inga tillgänglighetsrelaterade appar installerade."\n\n"Du kan hämta en skärmläsare för enheten från Android Market."\n\n"Klicka på OK om du vill installera skärmläsaren."</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Avstängningsknapp"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Avstängningsknappen avslutar samtal"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Under ett samtal avslutar avstängningsknappen samtalet i stället för att stänga av skärmen"</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"Batteriförbrukning"</string>
-    <string name="power_usage_summary" msgid="7237084831082848168">"Program som har förbrukat batteriet"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Appar som har förbrukat batteriet"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriförbrukning sedan bortkoppling"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batteriförbrukning sedan återställning"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> på batteri"</string>
@@ -1096,7 +1096,7 @@
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ej angivet)"</string>
     <string name="credentials_category" msgid="8536992056377271234">"Uppgiftslagring"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Använd säkra uppgifter"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Tillåt att program får åtkomst till säkra certifikat och andra uppgifter"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Tillåt att appar får åtkomst till säkra certifikat och andra uppgifter"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ange lösenord"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Ange lösenord för lagring av uppgifter."</string>
     <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installera från USB-enhet"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8876400b6c3..1a322c733f4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -474,7 +474,7 @@
     <string name="accelerometer_summary_off" msgid="5485489363715740761">"旋轉手機時自動改變顯示方向"</string>
     <string name="brightness" msgid="2354961343555249270">"亮度"</string>
     <string name="brightness_summary" msgid="838917350127550703">"調整螢幕亮度"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"螢幕逾時"</string>
+    <string name="screen_timeout" msgid="4882669461447531301">"螢幕自動關閉"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"調整螢幕自動關閉前的延遲時間"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
@@ -953,7 +953,7 @@
     <string name="battery_desc_radio" msgid="5479196477223185367">"手機無線電耗電量"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"切換到飛行模式，以便裝置不在服務涵蓋範圍時能節省電力"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"顯示與背光啟動時的耗電量"</string>
-    <string name="battery_sugg_display" msgid="3370202402045141760">"降低螢幕亮度和/或螢幕逾時時間"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"降低螢幕亮度和/或螢幕自動關閉時間"</string>
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fi 耗電量"</string>
     <string name="battery_sugg_wifi" msgid="7542345142282261691">"未使用或無法使用 Wi-Fi 時即關閉 Wi-Fi"</string>
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"藍牙耗電量"</string>

From 5efe251f4052d07eb9a40f7830f91d189edaa0bf Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Fri, 1 Apr 2011 16:12:35 -0700
Subject: [PATCH 4/6] Revert "Import revised translations.  DO NOT MERGE"

This reverts commit 955ab98f030cd198d838bdff8768ff87a17be9a8.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404
---
 res/values-ar/strings.xml     |  3 ---
 res/values-bg/strings.xml     |  3 ---
 res/values-ca/strings.xml     |  3 ---
 res/values-cs/arrays.xml      |  2 +-
 res/values-cs/strings.xml     |  3 ---
 res/values-da/strings.xml     |  3 ---
 res/values-de/strings.xml     |  5 +----
 res/values-el/strings.xml     |  3 ---
 res/values-en-rGB/strings.xml |  3 ---
 res/values-es-rUS/strings.xml |  3 ---
 res/values-es/strings.xml     |  3 ---
 res/values-fa/strings.xml     |  3 ---
 res/values-fi/strings.xml     |  3 ---
 res/values-fr/strings.xml     |  3 ---
 res/values-hr/strings.xml     |  9 +++------
 res/values-hu/strings.xml     |  3 ---
 res/values-in/strings.xml     |  3 ---
 res/values-it/strings.xml     |  3 ---
 res/values-iw/strings.xml     |  3 ---
 res/values-ja/strings.xml     |  3 ---
 res/values-ko/strings.xml     |  3 ---
 res/values-lt/strings.xml     |  3 ---
 res/values-lv/strings.xml     |  3 ---
 res/values-nb/strings.xml     | 13 +++++--------
 res/values-nl/strings.xml     |  3 ---
 res/values-pl/strings.xml     |  5 +----
 res/values-pt-rPT/strings.xml |  3 ---
 res/values-pt/strings.xml     |  3 ---
 res/values-rm/strings.xml     |  3 ---
 res/values-ro/strings.xml     |  5 +----
 res/values-ru/strings.xml     | 13 +++++--------
 res/values-sk/strings.xml     |  3 ---
 res/values-sl/strings.xml     |  3 ---
 res/values-sr/strings.xml     |  3 ---
 res/values-sv/strings.xml     |  3 ---
 res/values-th/strings.xml     |  3 ---
 res/values-tl/strings.xml     |  3 ---
 res/values-tr/strings.xml     |  5 +----
 res/values-uk/strings.xml     |  3 ---
 res/values-vi/strings.xml     |  3 ---
 res/values-zh-rCN/strings.xml |  3 ---
 res/values-zh-rTW/strings.xml |  3 ---
 42 files changed, 18 insertions(+), 141 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6e3e767af44..fc152f38716 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"إعدادات 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"إعداد شبكة 4G والمودم وإدراتهما"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"عنوان 4G MAC"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index d101a50fdd1..a1bc6205260 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Настройки на 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Настройка и управление на 4G мрежата и модема"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"MAC адрес за 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 19e7928cb4a..489962a2bfd 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"configuració 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Configura i gestiona la xarxa i el mòdem 4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"adreça MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index c4cfc2557a7..736f0b19af4 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -94,7 +94,7 @@
     <item msgid="8578370891960825148">"Neúspěšné"</item>
   </string-array>
   <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Otevřená"</item>
+    <item msgid="1435933968767043814">"Otevřít"</item>
     <item msgid="6318432659048829665">"WEP"</item>
     <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
     <item msgid="9098390198768443435">"802.1x EAP"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 10cbd15442a..81b07ab3cd6 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Nastavení sítě 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Nastavení a správa sítě 4G a modemu"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa MAC sítě 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b25c284fe5d..e205d79bafc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Indstillinger for 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Konfigurer og administrer 4G-netværk og -modem"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 439fd838e76..8b59f3e13f9 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -190,7 +190,7 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-Karte wird als Massenspeichergerät verwendet"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-Speicher kann nun entfernt werden"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Die SD-Karte kann jetzt entfernt werden."</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-Speicher während Verwendung entfernt"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-Speicher wurde während Verw. entfernt."</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Die SD-Karte wurde während der Verwendung entfernt!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Verwendete Bytes:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB-Sp. auf Medien scannen"</string>
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G-Einstellungen"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"4G-Netzwerk einrichten &amp; verwalten"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G-MAC-Adresse"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 15e92d29ed7..927aa7ecd9a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Ρυθμίσεις 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Εγκατάσταση και διαχείριση δικτύου και μόντεμ 4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Διεύθυνση 4G MAC"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 64bc976834d..5e26b54d734 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G settings"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Set up &amp; manage 4G network and modem"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2fe48b56231..724bc1b2e14 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Configuración de 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurar &amp; administrar red 4G y módem"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC de 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index dbefe746645..84ba62d9d3f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Ajustes de 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurar y gestionar módem y red 4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7f10b422413..d1ccad6f84b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"تنظیمات 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"تنظیم و مدیریت شبکه 4G و مودم"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"آدرس 4G MAC"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index bb59f7b75a1..c872e9817f4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G-asetukset"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Muodosta 4G-verkon ja modeemin asetukset ja hallinnoi niitä"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC -osoite"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7e30299dc11..704e3cddcba 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Paramètres 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurer et gérer le réseau et le modem 4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresse MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index fe6fc0caa5e..581ef277a9c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -193,7 +193,7 @@
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB memorija uklonjena je dok se upotrebljavala!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD kartica je uklonjena tijekom upotrebe!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Iskorišteni bajtovi:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skeniranje USB mem. za medije…"</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skeniranje USB poh. za medije…"</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Pretraživanje medija na SD kartici skeniranjem…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB poh. uklj. samo za čitanje"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD kartica priključena je u načinu samo za čitanje"</string>
@@ -537,7 +537,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Isključi SD karticu"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Isključi unutarnju USB memoriju"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Isključite karticu SD radi sigurnog uklanjanja"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Umetni USB mem. za uklj."</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Umetni mem. USB za uklj."</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Umetnite SD karticu za uključivanje"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Uključi memoriju USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Uključivanje SD kartice"</string>
@@ -553,7 +553,7 @@
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Isključi SD karticu"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Ako isključite memoriju USB, neke će se aplikacije koje upotrebljavate zaustaviti i mogu biti nedostupne dok ponovno ne uključite memoriju USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Ako isključite SD karticu, dio aplikacija koje koristite zaustavit će rad i možda će biti nedostupne sve dok ponovno ne uključite SD karticu."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Neusp. isključ. USB memorije"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Isključ. memorije USB neuspjelo"</string>
     <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Isključivanje SD kartice nije uspjelo"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Memorija USB ne može se isključiti. Pokušajte ponovno kasnije."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Nije moguće isključiti SD karticu. Pokušajte ponovno."</string>
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Postavke za 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Postavljanje i upravljanje 4G mrežom i modemom"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresa"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fcec73e8fdc..3f3bb55058e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G beállítások"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"4G hálózat és modem beállítása és kezelése"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-cím"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 97fcc2195da..23705c93ce7 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Setelan 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Memulai &amp; mengelola jaringan 4G dan modem"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5e6ffb2dd73..fd6c2ab608b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Impostazioni 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Imposta e gestisci rete e modem 4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Indirizzo MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c8ad73199a1..e23e021c9b4 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"הגדרות ‎4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"הגדר ונהל רשת ומודם של ‎4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"כתובת ‎4G MAC"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 736149846f3..22f1a5fc966 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G設定"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"4Gネットワークとモデムの設定と管理"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MACアドレス"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 654acfa1a77..517f3c777d4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G 설정"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"4G 네트워크와 모뎀 설정 및 관리"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 주소"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4678f8a13c5..16a80b3c92f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G nustatymai"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Nustatyti ir valdyti 4G tinklą ir modemą"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresas"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2deeb0e002b..c6348b42c67 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G iestatījumi"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"4G tīkla un modema pārvaldība un iestatīšana"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adrese"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ddd8b5cbcff..bb2122e011f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -716,7 +716,7 @@
     <string name="applications_settings_summary" msgid="2714215108369119717">"Installerte applikasjoner, hurtigtaster"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"Innstillinger for applikasjoner"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukjente kilder"</string>
-    <string name="install_unknown_applications" msgid="6612824788917283662">"Tillat installasjon av applikasjoner som ikke kommer fra Android-markedet"</string>
+    <string name="install_unknown_applications" msgid="6612824788917283662">"Tillat installasjon av programmer som ikke finnes på Android-markedet"</string>
     <string name="install_all_warning" msgid="1923717607319933741">"Telefonen og dine personlige data er mer sårbare mot angrep fra applikasjoner som kommer fra ukjente kilder. Du godtar at du selv er ansvarlig for enhver skade på telefonen eller tap av data som måtte oppstå fra bruk av slike applikasjoner."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Applikasjonsinformasjon"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
@@ -752,7 +752,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På minnekort"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktivert"</string>
-    <string name="no_applications" msgid="5190227407135243904">"Ingen applikasjoner."</string>
+    <string name="no_applications" msgid="5190227407135243904">"Ingen programmer."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortlagring"</string>
@@ -788,9 +788,9 @@
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Flytt program"</string>
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Fikk ikke flyttet programmet. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Foretrukket installeringssted"</string>
-    <string name="app_install_location_summary" msgid="879753854530300436">"Endre foretrukket plassering for installasjon av nye applikasjoner."</string>
+    <string name="app_install_location_summary" msgid="879753854530300436">"Endre foretrukket plassering for installasjon av nye programmer."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Bruk av lagringsplass"</string>
-    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Vis lagringsplass brukt av applikasjoner"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Vis lagringsplass for programmer"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kjørende tjenester"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Vis og kontroller tjenester som kjører for øyeblikket"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Starter på nytt"</string>
@@ -962,7 +962,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Prøv å koble til en annen Bluetooth-enhet"</string>
     <string name="battery_desc_apps" msgid="6665712811746233450">"Batteri brukt av program"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Stopp eller avinstaller applikasjonen"</string>
-    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Kontroller GPS manuelt, for å forhindre at applikasjoner bruker funksjonen"</string>
+    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Kontroller GPS manuelt, for å forhindre at programmer bruker funksjonen"</string>
     <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Applikasjonen har muligens innstillinger som kan redusere batteribruken"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siste gang uten strøm i <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G-innstillinger"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Konfigurer og administrer 4G-nettverk og -modem"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1c9c6dc6342..88a4cb6b6c0 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G-instellingen"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"4G-netwerk en modem instellen en beheren"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adres"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b2524e1a16e..0762d1ad6e6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -838,7 +838,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Naciśnij dwukrotnie klawisz spacji, aby wstawić kropkę"</string>
     <string name="show_password" msgid="2198798062604049206">"Widoczne hasła"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Pokazuj hasło podczas wpisywania"</string>
-    <string name="ime_security_warning" msgid="812267421486877917">"Ten sposób wprowadzania tekstu może gromadzić całą wpisaną treść, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Dotyczy to aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Czy użyć tego sposobu wprowadzania tekstu?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Ta metoda wprowadzania może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Metoda pochodzi z aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Czy użyć tej metody wprowadzania?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Słownik użytkownika"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Słownik użytkownika"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Ustawienia 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Konfiguruj sieć i modem 4G oraz zarządzaj nimi"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adres MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 719eb0f2d31..fd3bd239ae4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Definições de 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurar e gerir modem e rede 4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC de 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c18a8f06ec3..f72ce17684b 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Configurações de 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Configure e gerencie a rede e o modem 4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 5d2358a5edf..847917278da 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -1191,7 +1191,4 @@
     <skip />
     <!-- no translation found for status_wimax_mac_address (8390791848661413416) -->
     <skip />
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bef72ffa3cf..e36936018fd 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1161,9 +1161,6 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificări"</string>
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"Feedback"</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Setări 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configuraţi şi gestionaţi reţeaua 4G şi modemul"</string>
+    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configuraţi &amp; gest. reţeaua 4G şi modemul"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresă MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 200e996b273..df2bccbc8a7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -190,7 +190,7 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-карта используется в качестве устройства массовой памяти"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-накопитель можно отключить"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"SD-карта может быть извлечена"</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Накопитель извлечен при исп.!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Накопитель извлечен во время использования!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD-карта была извлечена во время использования!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Использовано байтов:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Сканирование USB-накопителя..."</string>
@@ -537,7 +537,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Извлечь SD-карту"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Отключить внутр. USB-накопитель"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Отключение SD-карты для ее безопасного извлечения из устройства"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Вставить USB-накопитель"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Вставить USB-накопитель для подключения"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Вставьте SD-карту для подключения"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Подключить USB-накопитель"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Подключить SD-карту"</string>
@@ -1097,7 +1097,7 @@
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не настроено)"</string>
     <string name="credentials_category" msgid="8536992056377271234">"Хранилище регистрационных данных"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Доступ к хранилищу"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и учет. данных"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и рег. данных"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ввод пароля"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Введите пароль для доступа в хранилище регистрационных данных."</string>
     <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Устанавливать с накопителя"</string>
@@ -1108,7 +1108,7 @@
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Установить или изменить пароль для доступа в хранилище рег. данных"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Очистить хранилище"</string>
     <string name="credentials_reset_summary" msgid="1530388094693731636">"Очистить все регистрационные данные в хранилище и сбросить пароль"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Вы действительно хотите удалить все учетные данные и сбросить пароль для доступа в хранилище учетных данных?"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Вы действительно хотите удалить все регистрационные данные и сбросить пароль для доступа в хранилище регистрационных данных?"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текущий пароль:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Новый пароль:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Подтвердите новый пароль:"</string>
@@ -1162,8 +1162,5 @@
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"Отклик на действия"</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Настройки 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Подключение и настройка сети и модема 4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"МАС-адрес для 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
+    <string name="status_wimax_mac_address" msgid="8390791848661413416">"МАС-адрес 4G"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 12c64235ac0..40c3f09c302 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Nastavenia 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Nastaviť a spravovať sieť 4G a modem"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa 4G MAC"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c96e683f73f..2619c685293 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Nastavitve za 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Nastavitev in upravljanje omrežja 4G in modema"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Naslov 4G MAC"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a6d3b233bfe..090cd29bbfd 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Подешавања за 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Подешавање и управљање 4G мрежом и модемом"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC адреса"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f4ee9efb319..8478958f339 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G-inställningar"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Konfigurera och hantera 4G-nätverk och modem"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G Mac-adress"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 305139059b0..ed2f560bc4c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"การตั้งค่า 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"ตั้งค่าและจัดการเครือข่าย 4G และโมเด็ม"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"ที่อยู่ MAC ใน 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f8e4cf96411..804901378d4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Mga setting na 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"I-set up at pamahalaan ang network at modem na 4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 7201db03104..9f30904312b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -537,7 +537,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartının bağlantısını kes"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Dahili USB depolamanın bağ kes"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Güvenle çıkarabilmnz için SD kartın bağl kesin"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Bağlantı için USByi takın"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Bğl için USB dep brm takn"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Eklemek için bir SD kart yerleştirin"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB depl birimini ekleyin"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD kartı ekle"</string>
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G ayarları"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"4G ağı ve modemi kurma ve yönetme"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresi"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 282ffd42666..26b3c654b4c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Налаштування 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Налаштувати 4G мережу та модем і керувати ними"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-адреса"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5401255783f..5cac4dd5605 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"Cài đặt 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Thiết lập &amp; quản lý modem và mạng 4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Địa chỉ MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b4babdd355e..afa9539ffea 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G 设置"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"设置和管理 4G 网络与调制解调器"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 地址"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8e46c73fcfc..ae995c3a882 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1163,7 +1163,4 @@
     <string name="wimax_settings" msgid="1574837328738396794">"4G 設定"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"設定與管理 4G 網路及數據機"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 位址"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="229615906377990968"></string>
-    <string name="additional_system_update" msgid="1810924041505424849"></string>
-    <string name="additional_system_update_menu" msgid="385634350600180091"></string>
 </resources>

From bcb8ec76e87a8a1b56552d47f896050135f85674 Mon Sep 17 00:00:00 2001
From: Simon Wilson <simonwilson@google.com>
Date: Fri, 1 Apr 2011 13:41:03 -0700
Subject: [PATCH 5/6] DO NOT MERGE Put additional update package names in
 config.xml

Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.

Change-Id: I73056716156c580606433bb63abfdd35c1b9892a
---
 res/values/config.xml  | 20 ++++++++++++++++++++
 res/values/strings.xml |  4 +---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100755 res/values/config.xml

diff --git a/res/values/config.xml b/res/values/config.xml
new file mode 100755
index 00000000000..04d27a08e24
--- /dev/null
+++ b/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="additional_system_update" translatable="false"></string>
+    <string name="additional_system_update_menu" translatable="false"></string>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cfc3b90cf02..82608473926 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2654,7 +2654,5 @@ found in the list of installed applications.</string>
     <string name="wimax_settings_summary">Set up &amp; manage 4G network and modem</string>
     <string name="status_wimax_mac_address">4G MAC address</string>
 
-    <string name="additional_system_update_settings_list_item_title"></string>
-    <string name="additional_system_update"></string>
-    <string name="additional_system_update_menu"></string>
+    <string name="additional_system_update_settings_list_item_title">Additional system updates</string>
 </resources>

From 0aa34b70d04529cf419304aac7535a2bfe6dbeb4 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Fri, 1 Apr 2011 16:42:38 -0700
Subject: [PATCH 6/6] Reimport Settings translations.  DO NOT MERGE

Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a
---
 res/values-cs/arrays.xml  |  2 +-
 res/values-de/strings.xml |  2 +-
 res/values-hr/strings.xml |  6 +++---
 res/values-nb/strings.xml | 10 +++++-----
 res/values-pl/strings.xml |  2 +-
 res/values-rm/strings.xml |  6 ++----
 res/values-ro/strings.xml |  2 +-
 res/values-ru/strings.xml | 10 +++++-----
 res/values-tr/strings.xml |  2 +-
 9 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 736f0b19af4..c4cfc2557a7 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -94,7 +94,7 @@
     <item msgid="8578370891960825148">"Neúspěšné"</item>
   </string-array>
   <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Otevřít"</item>
+    <item msgid="1435933968767043814">"Otevřená"</item>
     <item msgid="6318432659048829665">"WEP"</item>
     <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
     <item msgid="9098390198768443435">"802.1x EAP"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8b59f3e13f9..b66767cd4cf 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -190,7 +190,7 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-Karte wird als Massenspeichergerät verwendet"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-Speicher kann nun entfernt werden"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Die SD-Karte kann jetzt entfernt werden."</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-Speicher wurde während Verw. entfernt."</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-Speicher während Verwendung entfernt"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Die SD-Karte wurde während der Verwendung entfernt!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Verwendete Bytes:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB-Sp. auf Medien scannen"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 581ef277a9c..098af7ecb3c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -193,7 +193,7 @@
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB memorija uklonjena je dok se upotrebljavala!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD kartica je uklonjena tijekom upotrebe!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Iskorišteni bajtovi:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skeniranje USB poh. za medije…"</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skeniranje USB mem. za medije…"</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Pretraživanje medija na SD kartici skeniranjem…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB poh. uklj. samo za čitanje"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD kartica priključena je u načinu samo za čitanje"</string>
@@ -537,7 +537,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Isključi SD karticu"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Isključi unutarnju USB memoriju"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Isključite karticu SD radi sigurnog uklanjanja"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Umetni mem. USB za uklj."</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Umetni USB mem. za uklj."</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Umetnite SD karticu za uključivanje"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Uključi memoriju USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Uključivanje SD kartice"</string>
@@ -553,7 +553,7 @@
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Isključi SD karticu"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Ako isključite memoriju USB, neke će se aplikacije koje upotrebljavate zaustaviti i mogu biti nedostupne dok ponovno ne uključite memoriju USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Ako isključite SD karticu, dio aplikacija koje koristite zaustavit će rad i možda će biti nedostupne sve dok ponovno ne uključite SD karticu."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Isključ. memorije USB neuspjelo"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Neusp. isključ. USB memorije"</string>
     <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Isključivanje SD kartice nije uspjelo"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Memorija USB ne može se isključiti. Pokušajte ponovno kasnije."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Nije moguće isključiti SD karticu. Pokušajte ponovno."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index bb2122e011f..f4940bbb08d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -716,7 +716,7 @@
     <string name="applications_settings_summary" msgid="2714215108369119717">"Installerte applikasjoner, hurtigtaster"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"Innstillinger for applikasjoner"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukjente kilder"</string>
-    <string name="install_unknown_applications" msgid="6612824788917283662">"Tillat installasjon av programmer som ikke finnes på Android-markedet"</string>
+    <string name="install_unknown_applications" msgid="6612824788917283662">"Tillat installasjon av applikasjoner som ikke kommer fra Android-markedet"</string>
     <string name="install_all_warning" msgid="1923717607319933741">"Telefonen og dine personlige data er mer sårbare mot angrep fra applikasjoner som kommer fra ukjente kilder. Du godtar at du selv er ansvarlig for enhver skade på telefonen eller tap av data som måtte oppstå fra bruk av slike applikasjoner."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Applikasjonsinformasjon"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
@@ -752,7 +752,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På minnekort"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktivert"</string>
-    <string name="no_applications" msgid="5190227407135243904">"Ingen programmer."</string>
+    <string name="no_applications" msgid="5190227407135243904">"Ingen applikasjoner."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortlagring"</string>
@@ -788,9 +788,9 @@
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Flytt program"</string>
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Fikk ikke flyttet programmet. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Foretrukket installeringssted"</string>
-    <string name="app_install_location_summary" msgid="879753854530300436">"Endre foretrukket plassering for installasjon av nye programmer."</string>
+    <string name="app_install_location_summary" msgid="879753854530300436">"Endre foretrukket plassering for installasjon av nye applikasjoner."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Bruk av lagringsplass"</string>
-    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Vis lagringsplass for programmer"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Vis lagringsplass brukt av applikasjoner"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kjørende tjenester"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Vis og kontroller tjenester som kjører for øyeblikket"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Starter på nytt"</string>
@@ -962,7 +962,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Prøv å koble til en annen Bluetooth-enhet"</string>
     <string name="battery_desc_apps" msgid="6665712811746233450">"Batteri brukt av program"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Stopp eller avinstaller applikasjonen"</string>
-    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Kontroller GPS manuelt, for å forhindre at programmer bruker funksjonen"</string>
+    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Kontroller GPS manuelt, for å forhindre at applikasjoner bruker funksjonen"</string>
     <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Applikasjonen har muligens innstillinger som kan redusere batteribruken"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siste gang uten strøm i <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0762d1ad6e6..e0d59afc28d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -838,7 +838,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Naciśnij dwukrotnie klawisz spacji, aby wstawić kropkę"</string>
     <string name="show_password" msgid="2198798062604049206">"Widoczne hasła"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Pokazuj hasło podczas wpisywania"</string>
-    <string name="ime_security_warning" msgid="812267421486877917">"Ta metoda wprowadzania może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Metoda pochodzi z aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Czy użyć tej metody wprowadzania?"</string>
+    <string name="ime_security_warning" msgid="812267421486877917">"Ten sposób wprowadzania tekstu może gromadzić całą wpisaną treść, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Dotyczy to aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Czy użyć tego sposobu wprowadzania tekstu?"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Słownik użytkownika"</string>
     <string name="user_dict_settings_title" msgid="8357027437499042191">"Słownik użytkownika"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 847917278da..d6e5f8f472f 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -815,10 +815,8 @@
     <string name="service_started_by_app" msgid="6575184738671598131">"Servetsch avià da l\'applicaziun"</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <!-- no translation found for service_background_processes (6844156253576174488) -->
-    <skip />
-    <!-- no translation found for service_foreground_processes (7583975676795574276) -->
-    <skip />
+    <!-- outdated translation 4939976652114824214 -->     <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> disponibel"</string>
+    <!-- outdated translation 2474726487867913314 -->     <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> vegnan utilisads"</string>
     <!-- no translation found for memory (6609961111091483458) -->
     <skip />
     <!-- no translation found for service_process_name (4098932168654826656) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e36936018fd..d0a92ed3a6e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1161,6 +1161,6 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificări"</string>
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"Feedback"</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Setări 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configuraţi &amp; gest. reţeaua 4G şi modemul"</string>
+    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configuraţi şi gestionaţi reţeaua 4G şi modemul"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresă MAC 4G"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index df2bccbc8a7..ef5e488b4de 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -190,7 +190,7 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-карта используется в качестве устройства массовой памяти"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-накопитель можно отключить"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"SD-карта может быть извлечена"</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Накопитель извлечен во время использования!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Накопитель извлечен при исп.!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD-карта была извлечена во время использования!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Использовано байтов:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Сканирование USB-накопителя..."</string>
@@ -537,7 +537,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Извлечь SD-карту"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Отключить внутр. USB-накопитель"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Отключение SD-карты для ее безопасного извлечения из устройства"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Вставить USB-накопитель для подключения"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Вставить USB-накопитель"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Вставьте SD-карту для подключения"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Подключить USB-накопитель"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Подключить SD-карту"</string>
@@ -1097,7 +1097,7 @@
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не настроено)"</string>
     <string name="credentials_category" msgid="8536992056377271234">"Хранилище регистрационных данных"</string>
     <string name="credentials_access" msgid="4843187230913860492">"Доступ к хранилищу"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и рег. данных"</string>
+    <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и учет. данных"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ввод пароля"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Введите пароль для доступа в хранилище регистрационных данных."</string>
     <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Устанавливать с накопителя"</string>
@@ -1108,7 +1108,7 @@
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Установить или изменить пароль для доступа в хранилище рег. данных"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Очистить хранилище"</string>
     <string name="credentials_reset_summary" msgid="1530388094693731636">"Очистить все регистрационные данные в хранилище и сбросить пароль"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Вы действительно хотите удалить все регистрационные данные и сбросить пароль для доступа в хранилище регистрационных данных?"</string>
+    <string name="credentials_reset_hint" msgid="819990295796804516">"Вы действительно хотите удалить все учетные данные и сбросить пароль для доступа в хранилище учетных данных?"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текущий пароль:"</string>
     <string name="credentials_new_password" msgid="267487774686796938">"Новый пароль:"</string>
     <string name="credentials_confirm_password" msgid="4732250000633424345">"Подтвердите новый пароль:"</string>
@@ -1162,5 +1162,5 @@
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"Отклик на действия"</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Настройки 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Подключение и настройка сети и модема 4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"МАС-адрес 4G"</string>
+    <string name="status_wimax_mac_address" msgid="8390791848661413416">"МАС-адрес для 4G"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9f30904312b..0799b6bb75b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -537,7 +537,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartının bağlantısını kes"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Dahili USB depolamanın bağ kes"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Güvenle çıkarabilmnz için SD kartın bağl kesin"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Bğl için USB dep brm takn"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Bağlantı için USByi takın"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Eklemek için bir SD kart yerleştirin"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB depl birimini ekleyin"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD kartı ekle"</string>