merge from donut

author: Jean-Baptiste Queru <jbq@google.com> 2009-07-29 14:57:07 -0700
committer: Jean-Baptiste Queru <jbq@google.com> 2009-07-29 14:57:07 -0700
commit: 5f16c148dad5a1b8593473bef2f3b8d05d902017 (patch)
tree: 058a3a3c9f7e0888206fa26190398933b5b5a2fd
parent: aedd7474367a4ae2a2c7e16ec59aecbd77cc165c (diff)
parent: e0b5f33c6828073d04b5123f3f79d4b2728d8762 (diff)
download: packages_apps_Settings-5f16c148dad5a1b8593473bef2f3b8d05d902017.zip
packages_apps_Settings-5f16c148dad5a1b8593473bef2f3b8d05d902017.tar.gz
packages_apps_Settings-5f16c148dad5a1b8593473bef2f3b8d05d902017.tar.bz2
85 files changed, 16607 insertions, 2219 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2092321..1500d8b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -127,6 +127,7 @@
         </activity>
 
         <activity android:name=".vpn.VpnSettings"
+                android:configChanges="orientation|keyboardHidden"
                 android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -136,8 +137,12 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".vpn.VpnTypeSelection"></activity>
-        <activity android:name=".vpn.VpnEditor"></activity>
+        <activity android:name=".vpn.VpnTypeSelection"
+                android:configChanges="orientation|keyboardHidden">
+        </activity>
+        <activity android:name=".vpn.VpnEditor"
+                android:configChanges="orientation|keyboardHidden">
+        </activity>
 
         <activity android:name="DateTimeSettings" android:label="@string/date_and_time"
                 >
@@ -270,6 +275,7 @@
         </activity>
 
         <activity android:name="SecuritySettings" android:label="@string/security_settings_title"
+                android:configChanges="orientation|keyboardHidden"
                 android:clearTaskOnLaunch="true"
                 >
             <intent-filter>
diff --git a/res/layout/cstor_name_credential_dialog_view.xml b/res/layout/cstor_name_credential_dialog_view.xml
index e5ccb36..33688bd 100644
--- a/res/layout/cstor_name_credential_dialog_view.xml
+++ b/res/layout/cstor_name_credential_dialog_view.xml
@@ -46,6 +46,22 @@
                 android:layout_height="wrap_content"
                 android:singleLine="True"/>
 
+        <LinearLayout android:id="@+id/cstor_credential_password_container"
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:padding="0dip">
+            <TextView android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cstor_credential_password" />
+            <EditText android:id="@+id/cstor_credential_password"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:password="True"
+                    android:singleLine="True"/>
+        </LinearLayout>
+
         <TextView android:id="@+id/cstor_credential_info_title"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
diff --git a/res/layout/power_usage_action_item.xml b/res/layout/power_usage_action_item.xml
new file mode 100644
index 0000000..7b81ec1
--- /dev/null
+++ b/res/layout/power_usage_action_item.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingLeft="4dip"
+    android:focusable="true"
+    android:orientation="vertical"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <TextView android:id="@+id/summary"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dip"
+            android:ellipsize="marquee"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+        <!-- Spacer -->
+        <View
+                android:id="@+id/buttons_spacer_left"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.7"
+                android:visibility="invisible" />
+
+        <Button
+                android:id="@+id/action_button"
+                android:layout_width="150dip"
+                android:paddingRight="6dip"
+                android:layout_weight="0.3"
+                android:layout_height="wrap_content"/>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml
index ea7cfb3..f7485ee 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -103,43 +103,18 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/controls_section"
+            android:id="@+id/controls"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <TextView
-                android:id="@+id/controls_section_title"
+                android:id="@+id/controls_title"
                 style="?android:attr/listSeparatorTextViewStyle"
                 android:layout_marginTop="6dip"
                 android:text="@string/controls_subtitle" />
-            
-            <RelativeLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content">
 
-                <Button
-                    android:id="@+id/action_button1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginTop="6dip"
-                    android:layout_marginBottom="6dip"
-                    android:layout_marginRight="6dip"
-                    android:layout_alignParentLeft="true"
-                    android:layout_weight="1"/>
-                <Button
-                    android:id="@+id/action_button2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginTop="6dip"
-                    android:layout_marginBottom="6dip"
-                    android:layout_marginRight="6dip"
-                    android:layout_alignParentRight="true"
-                    android:layout_weight="1"/>
-
-            </RelativeLayout>
+            <!-- Controls go here ... -->
 
         </LinearLayout>
                     
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 6fbd9c8..e402181 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -32,18 +32,44 @@
     <item>"10 minut"</item>
     <item>"Nevypínat"</item>
   </string-array>
+  <string-array name="tts_rate_entries">
+    <item>"Velmi pomalá"</item>
+    <item>"Nízká"</item>
+    <item>"Běžná"</item>
+    <item>"Vysoká"</item>
+    <item>"Velmi rychlá"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item>"Velmi nízká"</item>
+    <item>"Nízká"</item>
+    <item>"Běžná"</item>
+    <item>"Vysoká"</item>
+    <item>"Velmi vysoká"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item>"americká angličtina"</item>
+    <item>"britská angličtina"</item>
+    <item>"francouzština"</item>
+    <item>"němčina"</item>
+    <item>"italština"</item>
+    <item>"španělština"</item>
+  </string-array>
   <string-array name="wifi_security_entries">
     <item>"Automaticky"</item>
     <item>"Žádné"</item>
     <item>"WEP"</item>
-    <item>"WPA Personal"</item>
-    <item>"WPA2 Personal"</item>
+    <item>"WPA personal"</item>
+    <item>"WPA2 personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item>"Žádné"</item>
     <item>"WEP"</item>
-    <item>"WPA Personal"</item>
-    <item>"WPA2 Personal"</item>
+    <item>"WPA personal"</item>
+    <item>"WPA2 personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item>"Automaticky"</item>
@@ -73,4 +99,19 @@
     <item>"Počet spuštění"</item>
     <item>"Název aplikace"</item>
   </string-array>
+  <string-array name="wifi_eap_entries">
+    <item>"PEAP"</item>
+    <item>"TLS"</item>
+    <item>"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item>"Žádné"</item>
+    <item>"PAP"</item>
+    <item>"MSCHAP"</item>
+    <item>"MSCHAP2"</item>
+    <item>"GTC"</item>
+  </string-array>
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 5507d59..4318c37 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -107,7 +107,10 @@
     <string name="date_and_time">"Nastavení data a času"</string>
     <string name="date_time_12_hour_sample">"13:00"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Změna času"</string>
+    <string name="date_time_changeDate_text">"Datum"</string>
     <string name="choose_timezone">"Volba časového pásma"</string>
+    <string name="normal_date_format">"Běžný (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label">"Náhled:"</string>
     <string name="display_font_size_label">"Velikost písma:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -188,12 +191,23 @@
     <string name="proxy_settings_label">"Nastavení proxy serveru"</string>
     <string name="cancel">"Zrušit"</string>
     <string name="settings_label">"Nastavení"</string>
+    <string name="settings_shortcut">"Nastavení"</string>
     <string name="airplane_mode">"Režim V letadle"</string>
     <string name="airplane_mode_summary">"Vypne všechna bezdrátová připojení"</string>
     <string name="airplane_mode_turning_on">"Vypínání bezdrátových připojení..."</string>
     <string name="airplane_mode_turning_off">"Povolování bezdrátových připojení..."</string>
     <string name="radio_controls_title">"Ovládání bezdrátových sítí"</string>
-    <string name="radio_controls_summary">"Umožňuje spravovat WiFi, Bluetooth, režim v letadle a mobilní sítě"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <string name="roaming">"Datové služby při roamingu"</string>
+    <string name="roaming_enable">"Datové služby se mohou připojovat při roamingu"</string>
+    <string name="roaming_disable">"Datové služby se mohou připojovat při roamingu"</string>
+    <string name="roaming_reenable_message">"Připojení datových služeb bylo přerušeno, protože jste opustili domovskou síť a datové služby při roamingu máte vypnuty."</string>
+    <string name="roaming_turn_it_on_button">"Zapnout"</string>
+    <string name="roaming_warning">"Opravdu chcete povolit datové služby při roamingu? Mohou být účtovány vysoké poplatky."</string>
+    <string name="roaming_reenable_title">"Upozornění"</string>
+    <string name="networks">"Výběr operátora"</string>
+    <string name="sum_carrier_select">"Vybrat síťového operátora"</string>
     <string name="date_and_time_settings_title">"Datum a čas"</string>
     <string name="date_and_time_settings_summary">"Umožňuje nastavit datum, čas, časové pásmo a formát"</string>
     <string name="date_time_auto">"Automaticky"</string>
@@ -207,7 +221,8 @@
     <string name="zone_list_menu_sort_alphabetically">"Řadit abecedně"</string>
     <string name="zone_list_menu_sort_by_timezone">"Řadit podle časového pásma"</string>
     <string name="security_settings_title">"Zabezpečení a poloha"</string>
-    <string name="security_settings_summary">"Umožňuje nastavit vaši polohu, odemknutí obrazovky a blokování karty SIM"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"Hesla"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Zapíná Bluetooth"</string>
@@ -220,6 +235,8 @@
     <string name="bluetooth_error_title">"Upozornění"</string>
     <string name="bluetooth_pairing_error_message">"Při párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k potížím."</string>
     <string name="bluetooth_pairing_pin_error_message">"Při párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k potížím. Zadaný kód PIN je nesprávný."</string>
+    <string name="bluetooth_pairing_device_down_error_message">"Nelze navázat komunikaci se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message">"Párování odmítnuto zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message">"Při připojování k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k potížím."</string>
     <string name="bluetooth_preference_scan_title">"Vyhledat zařízení"</string>
     <string name="bluetooth_device_context_connect">"Připojit"</string>
@@ -260,11 +277,15 @@
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <string name="wifi_security_wpa_eap">"WPA-EAP"</string>
+    <string name="wifi_security_ieee8021x">"IEEE8021X"</string>
     <string name="wifi_security_unknown">"Neznámé"</string>
-    <string name="wifi_security_verbose_open">"Nezabezpečená síť"</string>
-    <string name="wifi_security_verbose_wep">"Zabezpečení WEP"</string>
-    <string name="wifi_security_verbose_wpa">"Zabezpečení WPA"</string>
-    <string name="wifi_security_verbose_wpa2">"Zabezpečení WPA2"</string>
+    <string name="wifi_security_verbose_open">"nezabezpečená síť"</string>
+    <string name="wifi_security_verbose_wep">"zabezpečení WEP"</string>
+    <string name="wifi_security_verbose_wpa">"zabezpečení WPA"</string>
+    <string name="wifi_security_verbose_wpa2">"zabezpečení WPA2"</string>
+    <string name="wifi_security_verbose_wpa_eap">"zabezpečení WPA-EAP"</string>
+    <string name="wifi_security_verbose_ieee8021x">"zabezpečení IEEE 802.1x"</string>
     <string name="ip_address">"Adresa IP"</string>
     <string name="signal">"Síla signálu"</string>
     <string name="wifi_starting">"Zapínání WiFi..."</string>
@@ -277,12 +298,19 @@
     <string name="error_saving">"Síť nelze uložit."</string>
     <string name="connect">"Připojit"</string>
     <string name="connect_to_blank">"Připojit k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="please_select_eap">"Metoda EAP"</string>
+    <string name="please_select_phase2">"Ověření Phase 2"</string>
+    <string name="please_type_identity">"Identita"</string>
+    <string name="please_type_anonymous_identity">"Anonymní identita"</string>
+    <string name="please_select_client_certificate">"Certifikát klienta"</string>
+    <string name="please_select_ca_certificate">"Certifikát CA"</string>
+    <string name="please_type_private_key_passwd">"Soukromý klíč"</string>
     <string name="please_type_passphrase">"Heslo bezdrátové sítě"</string>
     <string name="please_type_hex_key">"Hexadecimální klíč WEP (0-9, A-F)"</string>
     <string name="wifi_show_password">"Zobrazovat heslo."</string>
     <string name="scan_wifi">"Vyhledávání"</string>
     <string name="summary_not_in_range">"Mimo dosah"</string>
-    <string name="summary_remembered">"Uložené nastavení"</string>
+    <string name="summary_remembered">"uložené nastavení"</string>
     <string name="summary_connection_failed">"Připojení se nezdařilo, zkuste to znovu."</string>
     <string name="wifi_access_points">"Sítě WiFi"</string>
     <string name="wifi_type_ssid">"Identifikátor SSID sítě"</string>
@@ -360,10 +388,13 @@
     <string name="sound_effects_enable_summary_on">"Výběr na obrazovce je provázen zvuky"</string>
     <string name="sound_effects_enable_summary_off">"Výběr na obrazovce je provázen zvuky"</string>
     <string name="play_media_notification_sounds_enable_title">"Oznámení karty SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"Vypnout zvuky oznámení karty SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"Povolit zvuky oznámení karty SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_on">"Přehrát zvuk při oznámení karty SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_off">"Přehrát zvuk při oznámení karty SD"</string>
     <string name="sync_settings">"Synchronizace dat"</string>
     <string name="sync_settings_summary">"Umožňuje vybrat aplikace pro synchronizaci"</string>
+    <string name="search_settings">"Vyhledávání"</string>
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"Nastavení zobrazení"</string>
     <string name="animations_title">"Animace"</string>
     <string name="animations_summary_on">"Zobrazit animace otevírání a zavírání oken"</string>
@@ -407,10 +438,18 @@
     <string name="device_info_not_available">"Nedostupný"</string>
     <string name="device_status_activity_title">"Stav"</string>
     <string name="device_status">"Stav"</string>
-    <string name="device_status_summary">"IMEI, telefonní číslo, signál, atd."</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
     <string name="storage_settings_title">"Karta SD a paměť telefonu"</string>
     <string name="storage_settings_summary">"Odpojuje kartu SD a zobrazuje dostupnou paměť"</string>
-    <string name="status_number">"Telefonní číslo"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"Typ mobilní sítě"</string>
     <string name="status_data_state">"Stav mobilní sítě"</string>
     <string name="status_service_state">"Stav služby"</string>
@@ -464,9 +503,10 @@
     <string name="restore_default_apn_completed">"Obnovení výchozích nastavení názvu AP bylo dokončeno."</string>
     <string name="master_clear_title">"Obnovení továrních dat"</string>
     <string name="master_clear_summary">"Umožňuje odstranit všechna data v telefonu"</string>
-    <string name="master_clear_desc">"Tato akce obnoví výchozí tovární nastavení telefonu. Všechna data a stažené aplikace budou smazány."</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
     <string name="master_clear_button_text">"Resetovat telefon"</string>
-    <string name="master_clear_final_desc">"Opravdu chcete resetovat telefon? Smažete veškerá data a aplikace. Proces nelze zvrátit."</string>
+    <string name="master_clear_final_desc">"Chcete smazat všechny osobní informace a stažené aplikace? Tuto akci nelze vrátit zpět."</string>
     <string name="master_clear_final_button_text">"Odstranit vše"</string>
     <string name="master_clear_gesture_prompt">"Nakreslete své bezpečnostní gesto"</string>
     <string name="master_clear_gesture_explanation">"Chcete-li potvrdit resetování telefonu, musíte nakreslit bezpečnostní gesto."</string>
@@ -483,13 +523,18 @@
     <string name="call_settings_summary">"Umožňuje nastavit hlasovou schránku, přesměrování hovorů, další hovory na lince a ID volajícího"</string>
     <string name="network_settings_title">"Mobilní sítě"</string>
     <string name="network_settings_summary">"Umožňuje nastavit možnosti roamingu, sítí a názvy přístupových bodů"</string>
-    <string name="location_title">"Zdroje polohy"</string>
+    <string name="location_title">"Moje poloha"</string>
     <string name="location_network_based">"Zaměření přes bezdrátové sítě"</string>
     <string name="location_networks_disabled">"Zobrazuje polohu v aplikacích (jako Mapy) pomocí bezdrátových sítí"</string>
     <string name="location_neighborhood_level">"Poloha je zaměřena pomocí WiFi nebo mobilních sítí"</string>
-    <string name="location_gps">"Zapnout přijímač systému GPS"</string>
+    <string name="location_gps">"Zapnout GPS"</string>
     <string name="location_street_level">"Zaměření je s přesností na úrovni ulic (zrušením této volby lze šetřit baterii)"</string>
     <string name="location_gps_disabled">"Umožňuje zaměřit na úrovni ulic (vetší spotřeba baterie a nutný výhled na oblohu)"</string>
+    <string name="use_location_title">"Sdílet se společností Google"</string>
+    <string name="use_location_summary">"Umožnit službě Google využívat informace o poloze k poskytování přesnějšího vyhledávání a dalších služeb"</string>
+    <string name="use_location_warning_message">"Umožnit službě Google využívat informace o poloze k poskytování přesnějších výsledků vyhledávání a dalších služeb"</string>
+    <string name="agree">"Souhlasím"</string>
+    <string name="disagree">"Nesouhlasím"</string>
     <string name="about_settings">"Info o telefonu"</string>
     <string name="about_settings_summary">"Zobrazuje právní informace, stav telefonu a verzi softwaru"</string>
     <string name="legal_information">"Právní informace"</string>
@@ -555,6 +600,7 @@
     <string name="data_size_label">"Data"</string>
     <string name="uninstall_text">"Odinstalovat"</string>
     <string name="clear_user_data_text">"Vymazat data"</string>
+    <string name="app_factory_reset">"Odinstalovat aktualizace"</string>
     <string name="auto_launch_enable_text">"Aplikace byla nastavena, aby se pro některé akce spouštěla jako výchozí."</string>
     <string name="auto_launch_disable_text">"Žádná výchozí nastavení."</string>
     <string name="clear_activities">"Vymazat výchozí nastavení"</string>
@@ -576,10 +622,15 @@
     <string name="app_not_found_dlg_title">"Aplikace nebyla nalezena"</string>
     <string name="app_not_found_dlg_text">"Aplikaci se nepodařilo najít na seznamu nainstalovaných aplikací."</string>
     <string name="clear_data_failed">"Nepodařilo se vymazat data aplikace."</string>
+    <string name="app_factory_reset_dlg_title">"Odinstalace aktualizací"</string>
+    <string name="app_factory_reset_dlg_text">"Chcete odinstalovat všechny aktualizace této aplikace systému Android?"</string>
+    <string name="clear_failed_dlg_title">"Mazání dat"</string>
+    <string name="clear_failed_dlg_text">"Nepodařilo se smazat data aplikace"</string>
     <string name="security_settings_desc">"Tato aplikace má přístup k následujícím položkám telefonu:"</string>
     <string name="computing_size">"Probíhá výpočet…"</string>
     <string name="invalid_size_value">"Nepodařilo se určit velikost balíčku"</string>
     <string name="empty_list_msg">"Žádné aplikace třetí strany nejsou nainstalovány."</string>
+    <string name="version_text">"verze <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="language_settings">"Národní prostředí a text"</string>
     <string name="language_settings_summary">"Nastavení národního prostředí (jazyka a oblasti) a možností zadávání a automatických oprav textu"</string>
     <string name="language_category">"Nastavení národního prostředí"</string>
@@ -634,6 +685,8 @@
     <string name="keep_screen_on_summary">"Obrazovka se při nabíjení nepřepne do režimu spánku"</string>
     <string name="allow_mock_location">"Povoluje simulované polohy"</string>
     <string name="allow_mock_location_summary">"Povoluje simulované polohy"</string>
+    <string name="adb_warning_title">"Aktivovat ladění USB?"</string>
+    <string name="adb_warning_message">"Ladění USB je určeno pouze pro účely vývoje. Lze pomocí něho kopírovat data mezi počítačem a zařízením, instalovat aplikace do zařízení bez upozornění a číst data protokolů."</string>
     <string name="gadget_picker_title">"Zvolte gadget"</string>
     <string name="widget_picker_title">"Zvolte widget"</string>
     <string name="battery_history_details_for">"Podrobnosti pro UID %d"</string>
@@ -647,9 +700,9 @@
     <string name="battery_history_system_time">"Systémový čas:"</string>
     <string name="battery_history_total_time">"Celková doba:"</string>
     <string name="battery_history_starts">"Počet spuštění: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> dní, <xliff:g id="HOURS">%2$d</xliff:g> hod., <xliff:g id="MINUTES">%3$d</xliff:g> min., <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> hod., <xliff:g id="MINUTES">%2$d</xliff:g> min., <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> min., <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
+    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> dní <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
+    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
+    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
     <string name="battery_history_packages_sharing_this_uid">"Balíčky sdílející toto UID:"</string>
     <string name="battery_history_no_data">"Údaje o využití baterie nejsou k dispozici"</string>
@@ -672,4 +725,277 @@
     <string name="app_name_label">"Aplikace"</string>
     <string name="launch_count_label">"Počet"</string>
     <string name="usage_time_label">"Doba použití"</string>
+    <string name="accessibility_settings_title">"Usnadnění"</string>
+    <string name="accessibility_settings_summary">"Možnosti správy usnadnění"</string>
+    <string name="toggle_accessibility_title">"Usnadnění"</string>
+    <string name="accessibility_services_category">"Služby usnadnění"</string>
+    <string name="no_accessibility_services_summary">"Žádné nainstalované služby usnadnění."</string>
+    <string name="accessibility_service_security_warning">"Tato služba usnadnění může shromažďovat veškerý text, který napíšete, včetně osobních údajů a čísel kreditních karet, ne však hesla. Může také ukládat do protokolů vaše interakce s uživatelským rozhraním. Služba pochází z aplikace <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Chcete tuto službu usnadnění aktivovat?"</string>
+    <string name="accessibility_service_disable_warning">"Deaktivovat usnadnění?"</string>
+    <string name="power_usage_summary_title">"Využití baterie"</string>
+    <string name="power_usage_summary">"Co využívá baterii"</string>
+    <string name="battery_since_unplugged">"Využití baterie od odpojení"</string>
+    <string name="battery_since_reset">"Využití baterie od obnovení"</string>
+    <string name="battery_stats_duration">"<xliff:g id="TIME">%1$s</xliff:g> od odpojení"</string>
+    <string name="awake">"Doba provozu zařízení"</string>
+    <string name="wifi_on_time">"Doba provozu sítě WiFi"</string>
+    <string name="bluetooth_on_time">"Doba provozu sítě WiFi"</string>
+    <string name="usage_name_percent">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="PERCENT">%2$s</xliff:g> %%"</string>
+    <string name="details_title">"Podrobnosti využití baterie"</string>
+    <string name="details_subtitle">"Podrobnosti používání"</string>
+    <string name="controls_subtitle">"Upravit spotřebu energie"</string>
+    <string name="packages_subtitle">"Zahrnuté balíčky"</string>
+    <string name="power_screen">"Zobrazení"</string>
+    <string name="power_wifi">"WiFi"</string>
+    <string name="power_bluetooth">"Bluetooth"</string>
+    <string name="power_cell">"Telefon v pohotovostním režimu"</string>
+    <string name="power_phone">"Hlasové hovory"</string>
+    <string name="power_idle">"Telefon v pohotovostním režimu"</string>
+    <string name="usage_type_cpu">"Doba provozu procesoru"</string>
+    <string name="usage_type_cpu_foreground">"CPU v popředí"</string>
+    <string name="usage_type_gps">"GPS"</string>
+    <string name="usage_type_phone">"Telefon"</string>
+    <string name="usage_type_data_send">"Odeslaná data"</string>
+    <string name="usage_type_data_recv">"Přijatá data"</string>
+    <string name="usage_type_audio">"Zvuk"</string>
+    <string name="usage_type_video">"Video"</string>
+    <string name="usage_type_on_time">"Doba provozu zařízení"</string>
+    <string name="battery_action_stop">"Vynutit ukončení"</string>
+    <string name="battery_action_app_details">"Informace o aplikaci"</string>
+    <string name="battery_action_app_settings">"Nastavení aplikace"</string>
+    <string name="battery_action_display">"Nastavení zobrazení"</string>
+    <string name="battery_action_wifi">"Nastavení WiFi"</string>
+    <string name="battery_action_bluetooth">"Nastavení Bluetooth"</string>
+    <string name="battery_desc_voice">"Využití baterie hlasovými hovory"</string>
+    <string name="battery_desc_standby">"Využití baterie v pohotovostním režimu telefonu"</string>
+    <string name="battery_desc_radio">"Využití baterie jednotkou GSM"</string>
+    <string name="battery_sugg_radio">"V oblastech bez pokrytí přepněte do režimu V letadle"</string>
+    <string name="battery_desc_display">"Využití baterie displejem a podsvícením"</string>
+    <string name="battery_sugg_display">"Snižte jas displeje nebo interval vypnutí obrazovky"</string>
+    <string name="battery_desc_wifi">"Využití baterie sítí WiFi"</string>
+    <string name="battery_sugg_wifi">"Vypněte síť WiFi, když ji nepoužíváte nebo když není k dispozici"</string>
+    <string name="battery_desc_bluetooth">"Využití baterie technologií Bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic">"Vypněte technologii Bluetooth, když ji nepoužíváte"</string>
+    <string name="battery_sugg_bluetooth_headset">"Zkuste se připojit k jinému zařízení bluetooth"</string>
+    <string name="battery_desc_apps">"Využití baterie spuštěnými aplikacemi"</string>
+    <string name="battery_sugg_apps_info">"Ukončete aplikaci nebo ji odinstalujte"</string>
+    <string name="battery_sugg_apps_gps">"Vypněte systém GPS, když ho nepoužíváte"</string>
+    <string name="battery_sugg_apps_settings">"Tato aplikace může nabízet nastavení pro snížení využití baterie"</string>
+    <string name="menu_stats_unplugged">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojení"</string>
+    <string name="menu_stats_last_unplugged">"Při posledním odpojení pro <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total">"Využití baterie celkem"</string>
+    <string name="menu_stats_refresh">"Obnovit"</string>
+    <string name="process_kernel_label">"OS Android"</string>
+    <string name="process_mediaserver_label">"Mediaserver"</string>
+    <string name="tts_settings">"Syntéza řeči"</string>
+    <string name="tts_settings_summary">"Nastavit možnosti syntézy řeči"</string>
+    <string name="tts_settings_title">"Ovládací prvky syntezátoru řeči"</string>
+    <string name="use_default_tts_settings_title">"Vždy používat moje nastavení"</string>
+    <string name="use_default_tts_settings_summary">"Uvedené výchozí nastavení přepíše nastavení aplikace"</string>
+    <string name="tts_default_settings_section">"Výchozí nastavení"</string>
+    <string name="tts_default_rate_title">"Rychlost řeči"</string>
+    <string name="tts_default_rate_summary">"Rychlost mluveného textu"</string>
+    <string name="tts_default_pitch_title">"Výška"</string>
+    <string name="tts_default_pitch_summary">"Určuje rejstřík mluveného textu"</string>
+    <string name="tts_default_lang_title">"Jazyk"</string>
+    <string name="tts_default_lang_summary">"Nastavuje hlas mluveného textu odpovídající danému jazyku"</string>
+    <string name="tts_play_example_title">"Poslechnout příklad"</string>
+    <string name="tts_play_example_summary">"Přehrát krátkou ukázku syntézy řeči"</string>
+    <string name="tts_install_data_title">"Nainstalovat hlasová data"</string>
+    <string name="tts_install_data_summary">"Nainstalovat hlasová data pro syntézu řeči"</string>
+    <string name="tts_data_installed_summary">"Hlas pro syntézu řeči je již řádně nainstalován."</string>
+    <string name="tts_demo">"Toto je příklad syntézy řeči."</string>
+    <string name="tts_settings_changed_demo">"Nastavení se změnilo. Toto je příklad současného znění."</string>
+    <string name="gadget_title">"Ovládací prvek napájení"</string>
+    <string name="vpn_settings_activity_title">"Nastavení sítě VPN"</string>
+    <string name="vpn_connect_to">"Připojit k %s"</string>
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <string name="vpn_password_colon">"Heslo:"</string>
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <string name="vpn_connect_button">"Připojit"</string>
+    <string name="vpn_yes_button">"Ano"</string>
+    <string name="vpn_no_button">"Ne"</string>
+    <string name="vpn_back_button">"Zpět"</string>
+    <string name="vpn_mistake_button">"Ne, je to chyba"</string>
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <string name="vpn_connecting">"Připojování..."</string>
+    <string name="vpn_disconnecting">"Odpojování..."</string>
+    <string name="vpn_connected">"Připojeno"</string>
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <string name="vpn_profile_added">"Položka %s je přidána"</string>
+    <string name="vpn_profile_replaced">"Změny probíhají v %"</string>
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-no-nokeys/strings.xml b/res/values-da-nokeys/strings.xml
index 0e080b4..1056a32 100644
--- a/res/values-no-nokeys/strings.xml
+++ b/res/values-da-nokeys/strings.xml
@@ -15,5 +15,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">"Installerte applikasjoner, hurtigtaster"</string>
+    <string name="applications_settings_summary">"Administrer programmer"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
new file mode 100644
index 0000000..5625489
--- /dev/null
+++ b/res/values-da/arrays.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item>"Amerika"</item>
+    <item>"Europa"</item>
+    <item>"Afrika"</item>
+    <item>"Asien"</item>
+    <item>"Australien"</item>
+    <item>"Pacific"</item>
+    <item>"Alle"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item>"15 sekunder"</item>
+    <item>"30 sekunder"</item>
+    <item>"1 minut"</item>
+    <item>"2 minutter"</item>
+    <item>"10 minutter"</item>
+    <item>"Lad der aldrig opstå timeout"</item>
+  </string-array>
+    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
+    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
+    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
+    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
+    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
+    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
+    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
+    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
+    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
+    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
+    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
+    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
+    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
+    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
+    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
+    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
+    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
+    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
+    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
+    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
+    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
+    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
+    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
+    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
+  <string-array name="wifi_wep_type">
+    <item>"Automatisk"</item>
+    <item>"WEP ASCII"</item>
+    <item>"WEP-heksadecimal"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries">
+    <item>"Når skærmen slukker"</item>
+    <item>"Aldrig når tilsluttet"</item>
+    <item>"Aldrig"</item>
+  </string-array>
+  <string-array name="battery_history_type_spinner">
+    <item>"CPU-brug"</item>
+    <item>"Netværksbrug"</item>
+    <item>"GPS-brug"</item>
+    <item>"Sensorbrug"</item>
+    <item>"Delvis vågen brug"</item>
+    <item>"Anden brug"</item>
+  </string-array>
+  <string-array name="battery_history_which_spinner">
+    <item>"Siden sidste afbrydelse"</item>
+    <item>"I alt siden start"</item>
+    <item>"I alt hele tiden"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item>"Brugstid"</item>
+    <item>"Start optælling"</item>
+    <item>"Programnavn"</item>
+  </string-array>
+    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
+    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
+    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
+    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
+    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
+    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
+    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
+    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
new file mode 100644
index 0000000..9171acb
--- /dev/null
+++ b/res/values-da/strings.xml
@@ -0,0 +1,1146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="device_info_default">"Ukendt"</string>
+    <string name="turn_on_radio">"Slå radio til"</string>
+    <string name="turn_off_radio">"Slå radio fra"</string>
+    <string name="turn_on_qxdm">"Aktiver QXDM SD-log"</string>
+    <string name="turn_off_qxdm">"Deaktiver QXDM SD-log"</string>
+    <string name="radioInfo_menu_viewADN">"Vis SIM-adressebog"</string>
+    <string name="radioInfo_menu_viewFDN">"Vis faste opkaldsnumre"</string>
+    <string name="radioInfo_menu_viewSDN">"Vis tjenesten faste opkaldsnumre"</string>
+    <string name="radioInfo_menu_getPDP">"Hent PDP-liste"</string>
+    <string name="radioInfo_menu_enableData">"Aktiver dataforbindelse"</string>
+    <string name="radioInfo_menu_disableData">"Deaktiver dataforbindelse"</string>
+    <string name="radioInfo_menu_enableDataOnBoot">"Aktiver data ved start"</string>
+    <string name="radioInfo_menu_disableDataOnBoot">"Deaktiver data ved start"</string>
+    <string name="radioInfo_service_in">"I drift"</string>
+    <string name="radioInfo_service_out">"Ude af drift"</string>
+    <string name="radioInfo_service_emergency">"Kun nødopkald"</string>
+    <string name="radioInfo_service_off">"Radio slukket"</string>
+    <string name="radioInfo_roaming_in">"Roaming"</string>
+    <string name="radioInfo_roaming_not">"Roamer ikke"</string>
+    <string name="radioInfo_phone_idle">"Ikke aktiv"</string>
+    <string name="radioInfo_phone_ringing">"Ringer"</string>
+    <string name="radioInfo_phone_offhook">"Opkald i gang"</string>
+    <string name="radioInfo_data_disconnected">"Afbrudt"</string>
+    <string name="radioInfo_data_connecting">"Forbinder"</string>
+    <string name="radioInfo_data_connected">"Forbundet"</string>
+    <string name="radioInfo_data_suspended">"Midlertidigt standset"</string>
+    <string name="radioInfo_unknown">"ukendt"</string>
+    <string name="radioInfo_display_packets">"pk."</string>
+    <string name="radioInfo_display_bytes">"bytes"</string>
+    <string name="radioInfo_display_dbm">"dBm"</string>
+    <string name="radioInfo_display_asu">"asu"</string>
+    <string name="radioInfo_lac">"LAC"</string>
+    <string name="radioInfo_cid">"CID"</string>
+    <string name="sdcard_unmount">"Demonter SD-kort"</string>
+    <string name="sdcard_format">"Formater SD-kort"</string>
+    <string name="small_font">"Lille"</string>
+    <string name="medium_font">"Medium"</string>
+    <string name="large_font">"Stor"</string>
+    <string name="font_size_save">"OK"</string>
+    <string name="sdcard_setting">"SD-kort"</string>
+    <string name="battery_info_status_label">"Batteristatus:"</string>
+    <string name="battery_info_scale_label">"Batteriskala:"</string>
+    <string name="battery_info_level_label">"Batteriniveau:"</string>
+    <string name="battery_info_health_label">"Batterihelbred:"</string>
+    <string name="battery_info_technology_label">"Batteriteknologi:"</string>
+    <string name="battery_info_voltage_label">"Batterispænding:"</string>
+    <string name="battery_info_voltage_units">"mV"</string>
+    <string name="battery_info_temperature_label">"Batteritemperatur:"</string>
+    <string name="battery_info_temperature_units">"° C"</string>
+    <string name="battery_info_uptime">"Tid siden start:"</string>
+    <string name="battery_info_awake_battery">"Opvågningstid på batteri:"</string>
+    <string name="battery_info_awake_plugged">"Opvågningstid under opladning:"</string>
+    <string name="battery_info_screen_on">"Tid for skærm TIL:"</string>
+    <string name="battery_info_status_unknown">"Ukendt"</string>
+    <string name="battery_info_status_charging">"Oplader"</string>
+    <string name="battery_info_status_charging_ac">"(AC)"</string>
+    <string name="battery_info_status_charging_usb">"(USB)"</string>
+    <string name="battery_info_status_discharging">"Aflader"</string>
+    <string name="battery_info_status_not_charging">"Oplader ikke"</string>
+    <string name="battery_info_status_full">"Fuld"</string>
+    <string name="battery_info_health_unknown">"Ukendt"</string>
+    <string name="battery_info_health_good">"God"</string>
+    <string name="battery_info_health_overheat">"Overophed"</string>
+    <string name="battery_info_health_dead">"Dødt"</string>
+    <string name="battery_info_health_over_voltage">"Over spænding:"</string>
+    <string name="battery_info_health_unspecified_failure">"Ukendt fejl"</string>
+    <string name="bluetooth">"Bluetooth"</string>
+    <string name="bluetooth_visibility">"Søgbar"</string>
+    <string name="bluetooth_is_discoverable">"Søgbar i <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunder ..."</string>
+    <string name="bluetooth_not_discoverable">"Gør enheden søgbar"</string>
+    <string name="bluetooth_devices">"Bluetooth-enheder"</string>
+    <string name="bluetooth_device_name">"Enhedsnavn"</string>
+    <string name="bluetooth_name_not_set">"Der er ikke indstillet noget navn. Kontonavn bruges"</string>
+    <string name="bluetooth_scan_for_devices">"Scan efter enheder"</string>
+    <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes."</string>
+    <string name="bluetooth_connected">"Forbundet"</string>
+    <string name="bluetooth_disconnected">"Afbrudt"</string>
+    <string name="bluetooth_disconnecting">"Afbryder ..."</string>
+    <string name="bluetooth_connecting">"Opretter forbindelse ..."</string>
+    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <skip />
+    <string name="bluetooth_not_connected">"Par med denne enhed"</string>
+    <string name="bluetooth_pairing">"Parrer ..."</string>
+    <string name="bluetooth_paired">"Parret men ikke forbundet"</string>
+    <string name="bluetooth_device">"håndfri/headset"</string>
+    <string name="progress_scanning">"Scanner"</string>
+    <string name="bluetooth_notif_ticker">"Anmodning om Bluetooth-parring"</string>
+    <string name="bluetooth_notif_title">"Parringsanmodning"</string>
+    <string name="bluetooth_notif_message">"Vælg for at parre med "</string>
+    <string name="date_and_time">"Dato- og tidsindstillinger"</string>
+    <string name="date_time_12_hour_sample">"1:00 pm"</string>
+    <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Skift tid"</string>
+    <string name="date_time_changeDate_text">"Dato"</string>
+    <string name="choose_timezone">"Vælg tidszone"</string>
+    <!-- no translation found for normal_date_format (1982904221918374153) -->
+    <skip />
+    <string name="display_preview_label">"Eksempelvisning:"</string>
+    <string name="display_font_size_label">"Skrifttypestørrelse:"</string>
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text">"Send <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text">"Start <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label">"Konto:"</string>
+    <string name="proxy_clear_text">"Ryd"</string>
+    <string name="proxy_port_label">"Port"</string>
+    <string name="proxy_defaultView_text">"Gendan standarder"</string>
+    <string name="proxy_action_text">"Gem"</string>
+    <string name="proxy_hostname_label">"Værtsnavn"</string>
+    <string name="proxy_error">"Bemærk"</string>
+    <string name="proxy_error_dismiss">"OK"</string>
+    <string name="proxy_error_invalid_host">"Det indtastede værtsnavn er ikke gyldigt."</string>
+    <string name="proxy_error_empty_port">"Du skal udfylde portfeltet."</string>
+    <string name="proxy_error_empty_host_set_port">"Portfeltet skal være tomt, hvis værtsfeltet er tomt."</string>
+    <string name="proxy_error_invalid_port">"Den indtastede port er ikke gyldig."</string>
+    <string name="radio_info_signal_location_label">"Placering:"</string>
+    <string name="radio_info_neighboring_location_label">"Nabo-CID:"</string>
+    <string name="radio_info_data_attempts_label">"Dataforsøg:"</string>
+    <string name="radio_info_gprs_service_label">"GPRS-tjeneste:"</string>
+    <string name="radio_info_roaming_label">"Roaming:"</string>
+    <string name="radio_info_imei_label">"IMEI-nummer:"</string>
+    <string name="radio_info_call_redirect_label">"Omdirigering af opkald:"</string>
+    <string name="radio_info_ppp_resets_label">"Antal PPP-nulstillinger siden start:"</string>
+    <string name="radio_info_gsm_disconnects_label">"GSM-afbrydelser:"</string>
+    <string name="radio_info_current_network_label">"Aktuelt netværk:"</string>
+    <string name="radio_info_data_successes_label">"Datasucceser:"</string>
+    <string name="radio_info_ppp_received_label">"PPP modtaget:"</string>
+    <string name="radio_info_gsm_service_label">"GSM-tjeneste"</string>
+    <string name="radio_info_signal_strength_label">"Signalstyrke:"</string>
+    <string name="radio_info_call_status_label">"Opkaldsstatus:"</string>
+    <string name="radio_info_ppp_sent_label">"PPP sendt:"</string>
+    <string name="radio_info_radio_resets_label">"Radionulstillinger:"</string>
+    <string name="radio_info_message_waiting_label">"Besked venter:"</string>
+    <string name="radio_info_phone_number_label">"Telefonnummer:"</string>
+    <string name="radio_info_band_mode_label">"Vælg radiobånd"</string>
+    <string name="radio_info_network_type_label">"Netværkstype:"</string>
+    <string name="radio_info_set_perferred_label">"Indstil foretrukken netværkstype:"</string>
+    <string name="radio_info_ping_ipaddr">"Ping-IpAdr.:"</string>
+    <string name="radio_info_ping_hostname">"Ping-værtsnavn(www.google.com):"</string>
+    <string name="radio_info_http_client_test">"HTTP-klienttest:"</string>
+    <string name="radio_info_toggle_ciph_label">"Skift nummer"</string>
+    <string name="ping_test_label">"Kør ping-test"</string>
+    <string name="radio_info_smsc_label">"SMSC:"</string>
+    <string name="radio_info_smsc_update_label">"Opdater"</string>
+    <string name="radio_info_smsc_refresh_label">"Opdater"</string>
+    <string name="radio_info_toggle_dns_check_label">"Skift DNS-kontrol"</string>
+    <string name="band_mode_title">"Indstil GSM/UMTS-bånd"</string>
+    <string name="band_mode_loading">"Indlæser båndliste ..."</string>
+    <string name="band_mode_set">"Indstil"</string>
+    <string name="band_mode_failed">"Mislykkedes"</string>
+    <string name="band_mode_succeeded">"Lykkedes"</string>
+    <string name="sdcard_changes_instructions">"Ændringer træder i kraft, når USB-kablet er forbundet igen"</string>
+    <string name="sdcard_settings_screen_mass_storage_text">"Aktiver USB-masselagring"</string>
+    <string name="sdcard_settings_total_bytes_label">"Bytes i alt:"</string>
+    <string name="sdcard_settings_not_present_status">"Der er intet SD-kort"</string>
+    <string name="sdcard_settings_available_bytes_label">"Ledige bytes:"</string>
+    <string name="sdcard_settings_mass_storage_status">"SD-kortet bruges som en masselagringsenhed"</string>
+    <string name="sdcard_settings_unmounted_status">"SD-kortet kan nu fjernes sikkert"</string>
+    <string name="sdcard_settings_bad_removal_status">"SD-kortet blev fjernet, mens det stadig var i brug."</string>
+    <string name="sdcard_settings_used_bytes_label">"Brugte bytes:"</string>
+    <string name="sdcard_settings_scanning_status">"Scanner SD-kort efter medier ..."</string>
+    <string name="sdcard_settings_read_only_status">"SD-kort monteret som skrivebeskyttet"</string>
+    <string name="next_label">"Næste"</string>
+    <string name="language_picker_title">"Landestandard"</string>
+    <string name="select_your_language">"Vælg dit sprog"</string>
+    <string name="activity_picker_label">"Vælg aktivitet"</string>
+    <string name="device_info_label">"Enhedsoplysninger"</string>
+    <string name="battery_info_label">"Batterioplysninger"</string>
+    <string name="battery_history_label">"Batterioversigt"</string>
+    <string name="display_label">"Visning"</string>
+    <string name="phone_info_label">"Telefonoplysninger"</string>
+    <string name="sd_card_settings_label">"SD-kort"</string>
+    <string name="proxy_settings_label">"Proxyindstillinger"</string>
+    <string name="cancel">"Annuller"</string>
+    <string name="settings_label">"Indstillinger"</string>
+    <!-- no translation found for settings_shortcut (3672145147925639262) -->
+    <skip />
+    <string name="airplane_mode">"Flytilstand"</string>
+    <string name="airplane_mode_summary">"Deaktiver alle trådløse forbindelser"</string>
+    <string name="airplane_mode_turning_on">"Deaktiverer trådløse forbindelser ..."</string>
+    <string name="airplane_mode_turning_off">"Aktiverer trådløse forbindelser ..."</string>
+    <string name="radio_controls_title">"Trådløse kontrolelementer"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
+    <string name="date_and_time_settings_title">"Dato og tid"</string>
+    <string name="date_and_time_settings_summary">"Indstil dato, tid, tidszone og formater"</string>
+    <string name="date_time_auto">"Automatisk"</string>
+    <string name="date_time_auto_summaryOn">"Brug netværksleverede værdier"</string>
+    <string name="date_time_auto_summaryOff">"Brug netværksleverede værdier"</string>
+    <string name="date_time_24hour">"Brug 24 timers format"</string>
+    <string name="date_time_set_time">"Indstil tid"</string>
+    <string name="date_time_set_timezone">"Vælg tidszone"</string>
+    <string name="date_time_set_date">"Indstil dato"</string>
+    <string name="date_time_date_format">"Vælg datoformat"</string>
+    <string name="zone_list_menu_sort_alphabetically">"Sorter alfabetisk"</string>
+    <string name="zone_list_menu_sort_by_timezone">"Sorter efter tidszone"</string>
+    <string name="security_settings_title">"Sikkerhed og placering"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
+    <string name="security_passwords_title">"Adgangskoder"</string>
+    <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_summary">"Slå Bluetooth til"</string>
+    <string name="bluetooth_settings">"Bluetooth-indstillinger"</string>
+    <string name="bluetooth_settings_title">"Bluetooth-indstillinger"</string>
+    <string name="bluetooth_settings_summary">"Administrer forbindelser, indstil enhedsnavn og søgbarhed"</string>
+    <string name="bluetooth_pin_entry">"Anmodning om Bluetooth-parring"</string>
+    <string name="bluetooth_device_info">"Oplysninger om Bluetooth-enhed"</string>
+    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Indtast PIN-kode for at parre."\n"(Prøv 0000 eller 1234)."</string>
+    <string name="bluetooth_error_title">"Bemærk"</string>
+    <string name="bluetooth_pairing_error_message">"Der var problemer med at parre med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_pairing_pin_error_message">"Der var problemer med at parre med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, fordi den indtastede PIN-kode er forkert."</string>
+    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
+    <skip />
+    <string name="bluetooth_connecting_error_message">"Der var problemer med at oprette forbindelse til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_preference_scan_title">"Scan efter enheder"</string>
+    <string name="bluetooth_device_context_connect">"Forbind"</string>
+    <string name="bluetooth_device_context_disconnect">"Afbryd"</string>
+    <string name="bluetooth_device_context_pair_connect">"Par, og forbind"</string>
+    <string name="bluetooth_device_context_unpair">"Ophæv parring"</string>
+    <string name="bluetooth_device_context_disconnect_unpair">"Afbryd, og ophæv parring"</string>
+    <string name="bluetooth_device_context_connect_advanced">"Valgmuligheder ..."</string>
+    <string name="bluetooth_connect_specific_profiles_title">"Opret forbindelse til ..."</string>
+    <string name="bluetooth_profile_a2dp">"Medier"</string>
+    <string name="bluetooth_profile_headset">"Telefon"</string>
+    <string name="bluetooth_summary_connected_to_a2dp">"Forbundet til medielyd"</string>
+    <string name="bluetooth_summary_connected_to_headset">"Forbundet til telefonlyd"</string>
+    <string name="bluetooth_summary_connected_to_a2dp_headset">"Forbundet til telefon- og medielyd"</string>
+    <string name="bluetooth_device_advanced_title">"Valgmuligheder for <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_device_advanced_online_mode_title">"Forbind"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary">"Opret forbindelse til Bluetooth-enhed"</string>
+    <string name="bluetooth_device_advanced_profile_header_title">"Profiler"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected">"Forbundet til medielyd"</string>
+    <string name="bluetooth_headset_profile_summary_connected">"Forbundet til telefonlyd"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for">"Brug medielyd"</string>
+    <string name="bluetooth_headset_profile_summary_use_for">"Brug til telefonlyd"</string>
+    <string name="wifi">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary">"Slå Wi-Fi til"</string>
+    <string name="wifi_settings">"Wi-Fi-indstillinger"</string>
+    <string name="wifi_settings_category">"Wi-Fi-indstillinger"</string>
+    <string name="wifi_settings_summary">"Opsæt og administrer trådløse adgangspunkter"</string>
+    <string name="forget_network">"Glem"</string>
+    <string name="wifi_status">"Status"</string>
+    <string name="wifi_link_speed">"Hastighed"</string>
+    <string name="wifi_signal_3">"Fremragende"</string>
+    <string name="wifi_signal_2">"God"</string>
+    <string name="wifi_signal_1">"Rimeligt"</string>
+    <string name="wifi_signal_0">"Dårlig"</string>
+    <string name="security">"Sikkerhed"</string>
+    <string name="wifi_security_open">"Åbn"</string>
+    <string name="wifi_security_wep">"WEP"</string>
+    <string name="wifi_security_wpa">"WPA"</string>
+    <string name="wifi_security_wpa2">"WPA2"</string>
+    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
+    <skip />
+    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
+    <skip />
+    <string name="wifi_security_unknown">"Ukendt"</string>
+    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
+    <skip />
+    <string name="ip_address">"IP-adresse"</string>
+    <string name="signal">"Signalstyrke"</string>
+    <string name="wifi_starting">"Tænder ..."</string>
+    <string name="wifi_stopping">"Slukker ..."</string>
+    <string name="wifi_error">"Fejl"</string>
+    <string name="error_starting">"Wi-Fi kunne ikke startes"</string>
+    <string name="error_stopping">"Wi-Fi kan ikke stoppes"</string>
+    <string name="error_scanning">"Der kunne ikke scannes efter netværk"</string>
+    <string name="error_connecting">"Der kunne ikke oprettes forbindelse til netværket"</string>
+    <string name="error_saving">"Netværket kunne ikke gemmes"</string>
+    <string name="connect">"Forbind"</string>
+    <string name="connect_to_blank">"Opret forbindelse til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for please_select_eap (4488240331626456338) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for please_type_identity (7061261155499513089) -->
+    <skip />
+    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
+    <skip />
+    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
+    <skip />
+    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
+    <skip />
+    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
+    <skip />
+    <string name="please_type_passphrase">"Adgangskode til trådløs"</string>
+    <string name="please_type_hex_key">"tast til \"WEP-heksadecimal\" (0-9, A-F)"</string>
+    <string name="wifi_show_password">"Vis adgangskode."</string>
+    <string name="scan_wifi">"Scan"</string>
+    <string name="summary_not_in_range">"Ikke inden for rækkevidde"</string>
+    <!-- no translation found for summary_remembered (6079941090549401742) -->
+    <skip />
+    <string name="summary_connection_failed">"Forbindelsen mislykkedes. Vælg for at prøve igen"</string>
+    <string name="wifi_access_points">"Wi-Fi-netværk"</string>
+    <string name="wifi_type_ssid">"Netværk-SSID"</string>
+    <string name="wifi_security">"Sikkerhed"</string>
+    <string name="wifi_save_config">"Gem"</string>
+    <string name="wifi_password_unchanged">"(uændret)"</string>
+    <string name="wifi_add_other_network">"Tilføj Wi-Fi-netværk"</string>
+    <string name="wifi_notify_open_networks">"Netværksmeddelelse"</string>
+    <string name="wifi_notify_open_networks_summary">"Underret mig, når der er et tilgængeligt åbent netværk"</string>
+    <string name="wifi_password_incorrect_error">"Den indtastede netværksadgangskode er forkert. Prøv igen."</string>
+    <string name="wifi_generic_connection_error">"Der opstod et problem med at oprette forbindelse til netværket. Prøv igen."</string>
+    <string name="wifi_menu_advanced">"Avanceret"</string>
+    <string name="wifi_ip_settings_titlebar">"IP-indstillinger"</string>
+    <string name="wifi_ip_settings_menu_save">"Gem"</string>
+    <string name="wifi_ip_settings_menu_cancel">"Annuller"</string>
+    <string name="wifi_ip_settings_invalid_ip">"Indtast en gyldig IP-adresse."</string>
+    <string name="wifi_use_static_ip">"Brug statisk IP"</string>
+    <string name="wifi_ip_address">"IP-adresse"</string>
+    <string name="wifi_dns1">"DNS 1"</string>
+    <string name="wifi_dns2">"DNS 2"</string>
+    <string name="wifi_gateway">"Gateway"</string>
+    <string name="wifi_netmask">"Netmask"</string>
+    <string name="wifi_context_menu_connect">"Opret forbindelse til netværk"</string>
+    <string name="wifi_context_menu_forget">"Glem netværk"</string>
+    <string name="wifi_context_menu_change_password">"Skift adgangskode"</string>
+    <string name="wifi_advanced_titlebar">"Avanceret"</string>
+    <string name="wifi_setting_num_channels_title">"Regulatorisk domæne"</string>
+    <string name="wifi_setting_num_channels_summary">"Indstil antallet af kanaler, der skal bruges"</string>
+    <string name="wifi_setting_num_channels_error">"Der opstod et problem med indstillingen af det regulatoriske domæne."</string>
+    <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanaler"</string>
+    <string name="wifi_setting_sleep_policy_title">"Politik for Wi-Fi-dvale"</string>
+    <string name="wifi_setting_sleep_policy_summary">"Angiv, hvornår der skal skiftes fra Wi-Fi til mobile data"</string>
+    <string name="wifi_setting_sleep_policy_error">"Der opstod et problem med indstillingen af dvalepolitikken."</string>
+    <string name="wifi_advanced_mac_address_title">"MAC-adresse"</string>
+    <string name="fragment_status_scanning">"Scanner ..."</string>
+    <string name="fragment_status_connecting">"Opretter forbindelse til <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</string>
+    <string name="fragment_status_authenticating">"Autentificerer med <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</string>
+    <string name="fragment_status_obtaining_ip">"Henter IP-adresse fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</string>
+    <string name="fragment_status_connected">"Opret forbindelse til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="fragment_status_disconnecting">"Afbryder fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</string>
+    <string name="fragment_status_disconnected">"Afbrudt"</string>
+    <string name="fragment_status_failed">"Mislykkedes"</string>
+    <string name="status_scanning">"Scanner ..."</string>
+    <string name="status_connecting">"Forbinder ..."</string>
+    <string name="status_authenticating">"Autentificerer ..."</string>
+    <string name="status_obtaining_ip">"Henter adresse ..."</string>
+    <string name="status_connected">"Forbundet"</string>
+    <string name="status_disconnecting">"Afbryder ..."</string>
+    <string name="status_disconnected">"Afbrudt"</string>
+    <string name="status_failed">"Mislykkedes"</string>
+    <string name="sound_and_display_settings">"Lyd og visning"</string>
+    <string name="sound_settings">"Lydindstillinger"</string>
+    <string name="sound_and_display_settings_summary">"Indstil ringetoner, meddelelser, skærmlysstyrke"</string>
+    <string name="silent_mode_title">"Lydløs"</string>
+    <string name="silent_mode_summary">"Alle lyde undtagen medier og alarmer er lydløse"</string>
+    <string name="silent_mode_incl_alarm_summary">"Al lyd undtagen medier er lydløse"</string>
+    <string name="ringtone_title">"Telefonringetone"</string>
+    <string name="ringtone_summary">"Indstil din standardringetone til indgående opkald"</string>
+    <string name="ring_volume_title">"Opkaldslydstyrke"</string>
+    <string name="ring_volume_summary">"Indstil lydstyrke for indgående opkald og meddelelser"</string>
+    <string name="vibrate_title">"Vibrer telefon"</string>
+    <string name="vibrate_summary">"Vibrer telefonen ved indgående opkald"</string>
+    <string name="notification_sound_title">"Meddelelsesringetone"</string>
+    <string name="notification_sound_summary">"Indstil din standardmeddelelsesringetone"</string>
+    <string name="incoming_call_volume_title">"Lydstyrke for indgående opkald"</string>
+    <string name="notification_volume_title">"Meddelelseslydstyrke"</string>
+    <string name="checkbox_notification_same_as_incoming_call">"Brug indgående opkaldslydstyrke til meddelelser"</string>
+    <string name="notification_sound_dialog_title">"Vælg meddelelsesringetone"</string>
+    <string name="media_volume_title">"Medielydstyrke"</string>
+    <string name="media_volume_summary">"Indstil lydstyrke for musik og videoer"</string>
+    <string name="dtmf_tone_enable_title">"Hørlige touch-toner"</string>
+    <string name="dtmf_tone_enable_summary_on">"Afspil toner, når nummerblokken bruges"</string>
+    <string name="dtmf_tone_enable_summary_off">"Afspil toner, når nummerblokken bruges"</string>
+    <string name="sound_effects_enable_title">"Lydudvalg"</string>
+    <string name="sound_effects_enable_summary_on">"Afspil lyd, når der foretages skærmvalg"</string>
+    <string name="sound_effects_enable_summary_off">"Afspil lyd, når der foretages skærmvalg"</string>
+    <string name="play_media_notification_sounds_enable_title">"SD-kortmeddelelser"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
+    <skip />
+    <string name="sync_settings">"Datasynkronisering"</string>
+    <string name="sync_settings_summary">"Vælg, hvilke programmer der skal synkroniseres"</string>
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
+    <string name="display_settings">"Visningsindstillinger"</string>
+    <string name="animations_title">"Animation"</string>
+    <string name="animations_summary_on">"Vis animationer, når der åbnes og lukkes for vinduer"</string>
+    <string name="animations_summary_off">"Vis animationer, når der åbnes og lukkes for vinduer"</string>
+    <string name="accelerometer_title">"Retning"</string>
+    <string name="accelerometer_summary_on">"Skift automatisk retning, når telefonen drejes"</string>
+    <string name="accelerometer_summary_off">"Skift automatisk retning, når telefonen drejes"</string>
+    <string name="brightness">"Lysstyrke"</string>
+    <string name="brightness_summary">"Juster skærmens lysstyrke"</string>
+    <string name="screen_timeout">"Timeout for skærmen"</string>
+    <string name="screen_timeout_summary">"Juster forsinkelsen, inden skærmen slukkes automatisk"</string>
+    <string name="sim_lock_settings">"Indstillinger for lås af SIM-kort"</string>
+    <string name="sim_lock_settings_category">"Opsæt SIM-kortlås"</string>
+    <string name="sim_lock_settings_title">"SIM-kortlås"</string>
+    <string name="sim_pin_toggle">"Lås SIM-kort"</string>
+    <string name="sim_lock_on">"Kræv PIN-kode for at bruge telefonen"</string>
+    <string name="sim_lock_off">"Kræv PIN-kode for at bruge telefonen"</string>
+    <string name="sim_pin_change">"Skift PIN-kode til SIM-kort"</string>
+    <string name="sim_enter_pin">"PIN-kode til SIM-kort"</string>
+    <string name="sim_enable_sim_lock">"Lås SIM-kort"</string>
+    <string name="sim_disable_sim_lock">"Lås op for SIM-kortet"</string>
+    <string name="sim_enter_old">"Gammel PIN-kode til SIM-kort"</string>
+    <string name="sim_enter_new">"Ny PIN-kode til SIM-kort"</string>
+    <string name="sim_reenter_new">"Indtast den nye PIN-kode igen"</string>
+    <string name="sim_change_pin">"PIN-kode til SIM-kort"</string>
+    <string name="sim_bad_pin">"Forkert PIN-kode!"</string>
+    <string name="sim_pins_dont_match">"PIN-koderne stemmer ikke overens."</string>
+    <string name="sim_change_failed">"PIN-koden kunne ikke ændres."\n"Muligvis forkert PIN-kode."</string>
+    <string name="sim_change_succeeded">"PIN-kode til SIM-kortet er ændret"</string>
+    <string name="sim_lock_failed">"SIM-kortlåsens tilstand kunne ikke ændres."\n"Det skyldes muligvis en forkert PIN-kode."</string>
+    <string name="sim_enter_ok">"OK"</string>
+    <string name="sim_enter_cancel">"Annuller"</string>
+    <string name="device_info_settings">"Telefonstatus"</string>
+    <string name="system_update_settings_list_item_title">"Systemopdateringer"</string>
+    <string name="system_update_settings_list_item_summary">"Kontroller efter systemopdateringer"</string>
+    <string name="firmware_version">"Firmwareversion"</string>
+    <string name="model_number">"Modelnummer"</string>
+    <string name="baseband_version">"Basebandversion"</string>
+    <string name="kernel_version">"Kernesystem"</string>
+    <string name="build_number">"Versionnummer"</string>
+    <string name="device_info_not_available">"Ikke tilgængelig"</string>
+    <string name="device_status_activity_title">"Status"</string>
+    <string name="device_status">"Status"</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
+    <string name="storage_settings_title">"SD-kort og telefonlagerplads"</string>
+    <string name="storage_settings_summary">"Demonter SD-kort, vis ledig lagerplads"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
+    <string name="status_network_type">"Mobil netværkstype"</string>
+    <string name="status_data_state">"Mobil netværkstilstand"</string>
+    <string name="status_service_state">"Servicetilstand"</string>
+    <string name="status_signal_strength">"Signalstyrke"</string>
+    <string name="status_roaming">"Roaming"</string>
+    <string name="status_operator">"Netværk"</string>
+    <string name="status_wifi_mac_address">"Wi-Fi\'s MAC-adresse"</string>
+    <string name="status_bt_address">"Bluetooth-adresse"</string>
+    <string name="status_unavailable">"Utilgængelig"</string>
+    <string name="status_up_time">"Oppetid"</string>
+    <string name="status_awake_time">"Opvågningstid"</string>
+    <string name="internal_memory">"Intern telefonlagring"</string>
+    <string name="sd_memory">"SD-kort"</string>
+    <string name="memory_available">"Ledig plads"</string>
+    <string name="memory_size">"Plads i alt"</string>
+    <string name="sd_eject">"Demonter SD-kort"</string>
+    <string name="sd_eject_summary">"Demonter SD-kortet til sikker fjernelse"</string>
+    <string name="sd_format">"Formater SD-kort"</string>
+    <string name="sd_format_summary">"Formater (slet) SD-kortet"</string>
+    <string name="sd_unavailable">"Utilgængelig"</string>
+    <string name="read_only">" (Skrivebeskyttet)"</string>
+    <string name="battery_status_title">"Batteristatus"</string>
+    <string name="battery_level_title">"Batteriniveau"</string>
+    <string name="apn_settings">"APN\'er"</string>
+    <string name="apn_edit">"Rediger adgangspunkt"</string>
+    <string name="apn_not_set">"&lt;Ikke indstillet&gt;"</string>
+    <string name="apn_name">"Navn"</string>
+    <string name="apn_apn">"APN"</string>
+    <string name="apn_http_proxy">"Proxy"</string>
+    <string name="apn_http_port">"Port"</string>
+    <string name="apn_user">"Brugernavn"</string>
+    <string name="apn_password">"Adgangskode"</string>
+    <string name="apn_server">"Server"</string>
+    <string name="apn_mmsc">"MMSC"</string>
+    <string name="apn_mms_proxy">"MMS-proxy"</string>
+    <string name="apn_mms_port">"MMS-port"</string>
+    <string name="apn_mcc">"MCC"</string>
+    <string name="apn_mnc">"MNC"</string>
+    <string name="apn_type">"APN-type"</string>
+    <string name="menu_delete">"Slet APN"</string>
+    <string name="menu_new">"Ny APN"</string>
+    <string name="menu_save">"Gem"</string>
+    <string name="menu_cancel">"Kassér"</string>
+    <string name="error_title">"Bemærk"</string>
+    <string name="error_name_empty">"Navnefeltet må ikke være tomt."</string>
+    <string name="error_apn_empty">"APN kan ikke være tom."</string>
+    <string name="error_mcc_not3">"MCC-felt skal være på 3 tal."</string>
+    <string name="error_mnc_not23">"MNC-feltet skal være på 2 eller 3 tal."</string>
+    <string name="restore_default_apn">"Gendanner APN-standardindstillinger"</string>
+    <string name="menu_restore">"Nulstil til standard"</string>
+    <string name="restore_default_apn_completed">"Nulstilling af APN-standardindstillinger afsluttet"</string>
+    <string name="master_clear_title">"Nulstilling af fabriksdata"</string>
+    <string name="master_clear_summary">"Sletter alle data på telefonen"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
+    <string name="master_clear_button_text">"Nulstil telefon"</string>
+    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
+    <skip />
+    <string name="master_clear_final_button_text">"Slet alting"</string>
+    <string name="master_clear_gesture_prompt">"Tegn dit mønster til at låse op"</string>
+    <string name="master_clear_gesture_explanation">"Du skal tegne dit mønster til at låse op for at bekræfte nulstilling af telefonen."</string>
+    <string name="master_clear_failed">"Der blev ikke foretaget nogen nulstilling, fordi tjenesten Systemoprydning ikke er tilgængelig."</string>
+    <string name="media_format_title">"Formater SD-kort."</string>
+    <string name="media_format_summary">"Sletter alle data på SD-kortet"</string>
+    <string name="media_format_desc">"Denne handling sletter SD-kortet i telefonen. Du mister ALLE data på kortet!"</string>
+    <string name="media_format_button_text">"Formater SD-kort"</string>
+    <string name="media_format_final_desc">"Formater SD-kort. Dette sletter alle dine medier? Handlingen kan ikke omstødes."</string>
+    <string name="media_format_final_button_text">"Slet alting"</string>
+    <string name="media_format_gesture_prompt">"Tegn dit mønster til at låse op"</string>
+    <string name="media_format_gesture_explanation">"Du skal tegne dit mønster til at låse op for at bekræfte et SD-kortformat."</string>
+    <string name="call_settings_title">"Opkaldsindstillinger"</string>
+    <string name="call_settings_summary">"Opsæt voicemail, viderestilling af opkald, ventende opkald, opkalds-id"</string>
+    <string name="network_settings_title">"Mobilnetværk"</string>
+    <string name="network_settings_summary">"Indstil valgmuligheder for roaming, netværk, APN\'er"</string>
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
+    <string name="location_network_based">"Brug trådløse netværk"</string>
+    <string name="location_networks_disabled">"Se placering i programmer (som f.eks. Maps) ved hjælp af trådløse netværk"</string>
+    <string name="location_neighborhood_level">"Placering er afgjort af Wi-Fi og/eller mobile netværk"</string>
+    <string name="location_gps">"Aktiver GPS-satelliter"</string>
+    <string name="location_street_level">"Find præcise placeringer på gadeniveau (fravælg for at spare på batteriet)"</string>
+    <string name="location_gps_disabled">"Gå til gadeniveau (kræver mere batteri plus visning af himmel)"</string>
+    <!-- no translation found for use_location_title (7585990952633568732) -->
+    <skip />
+    <!-- no translation found for use_location_summary (4411467143899877395) -->
+    <skip />
+    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
+    <skip />
+    <string name="agree">"Enig"</string>
+    <string name="disagree">"Ikke enig"</string>
+    <string name="about_settings">"Om telefon"</string>
+    <string name="about_settings_summary">"Vis juridiske oplysninger, telefonstatus, softwareversion"</string>
+    <string name="legal_information">"Juridiske oplysninger"</string>
+    <string name="contributors_title">"Bidragsydere"</string>
+    <string name="copyright_title">"Ophavsret"</string>
+    <string name="license_title">"Licens"</string>
+    <string name="terms_title">"Vilkår og betingelser"</string>
+    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
+    <skip />
+    <string name="system_tutorial_list_item_summary">"Lær, hvordan du bruger din telefon"</string>
+    <string name="settings_license_activity_title">"Open source-licenser"</string>
+    <string name="settings_license_activity_unavailable">"Der er problemer med at indlæse licenserne."</string>
+    <string name="settings_license_activity_loading">"Indlæser ..."</string>
+    <string name="lock_settings_title">"Mønster til at låse skærmen op"</string>
+    <string name="lockpattern_change_lock_pattern_label">"Skift mønster til at låse op"</string>
+    <string name="lockpattern_need_to_unlock">"Bekræft gemt mønster"</string>
+    <string name="lockpattern_need_to_unlock_wrong">"Beklager! Prøv igen:"</string>
+    <string name="lockpattern_recording_intro_header">"Tegn et mønster til at låse op"</string>
+    <string name="lockpattern_recording_intro_footer">"Tryk på Menu for at få hjælp."</string>
+    <string name="lockpattern_recording_inprogress">"Slip fingeren, når du er færdig."</string>
+    <string name="lockpattern_recording_incorrect_too_short">"Forbind mindst <xliff:g id="NUMBER">%d</xliff:g> punkter. Prøv igen:"</string>
+    <string name="lockpattern_pattern_entered_header">"Mønster registreret!"</string>
+    <string name="lockpattern_need_to_confirm">"Tegn mønster igen for at bekræfte:"</string>
+    <string name="lockpattern_pattern_confirmed_header">"Dit nye mønster til at låse op:"</string>
+    <string name="lockpattern_confirm_button_text">"Bekræft"</string>
+    <string name="lockpattern_restart_button_text">"Tegn igen"</string>
+    <string name="lockpattern_retry_button_text">"Prøv igen"</string>
+    <string name="lockpattern_continue_button_text">"Fortsæt"</string>
+    <string name="lockpattern_settings_title">"Mønster til at låse op"</string>
+    <string name="lockpattern_settings_enable_title">"Kræv mønster"</string>
+    <string name="lockpattern_settings_enable_summary">"Du skal tegne mønster for at låse skærmen op"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">"Brug synligt mønster"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"Brug taktil feedback"</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"Indstil mønster til at låse op"</string>
+    <string name="lockpattern_settings_change_lock_pattern">"Skift mønster til at låse op"</string>
+    <string name="lockpattern_settings_help_how_to_record">"Sådan tegnes et mønster til at låse op"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"For mange forkerte forsøg!"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Prøv igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
+    <string name="skip_button_label">"Annuller"</string>
+    <string name="next_button_label">"Næste"</string>
+    <string name="lock_title">"Sikring af din telefon"</string>
+    <string name="lock_intro_message"><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å den 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? Vælg \"Næste\""</b>". "\n<font height="3">\n</font>"Du kan efterlade din telefon ubeskyttet ved at vælge \"Annuller\"."</font></string>
+    <string name="lock_example_title">"Eksempelmønster"</string>
+    <string name="lock_example_message">"Forbind mindst fire punkter."\n" "\n"Vælg \"Næste\", når du er klar til at tegne dit eget mønster."</string>
+    <string name="manageapplications_settings_title">"Administrer programmer"</string>
+    <string name="manageapplications_settings_summary">"Administrer og fjern installerede programmer"</string>
+    <string name="applications_settings">"Programmer"</string>
+    <string name="applications_settings_summary">"Administrer programmer, opstil genveje til hurtig start"</string>
+    <string name="applications_settings_header">"Programindstillinger"</string>
+    <string name="install_applications">"Ukendte kilder"</string>
+    <string name="install_unknown_applications">"Tillad installation af programmer, der ikke stammer fra Marked"</string>
+    <string name="install_all_warning">"Din telefon og dine personlige data er mere sårbare i forhold til angreb af programmer fra ukendte kilder. Du accepterer, at du alene er ansvarlig for skader på din telefon eller tab af data, der kan skyldes brug af disse programmer."</string>
+    <string name="application_info_label">"Programoplysninger"</string>
+    <string name="storage_label">"Lagring"</string>
+    <string name="auto_launch_label">"Start som standard"</string>
+    <string name="permissions_label">"Tilladelser"</string>
+    <string name="cache_header_label">"Cache"</string>
+    <string name="clear_cache_btn_text">"Ryd cache"</string>
+    <string name="cache_size_label">"Cache"</string>
+    <string name="controls_label">"Kontrolelementer"</string>
+    <string name="force_stop">"Tving til at standse"</string>
+    <string name="total_size_label">"I alt"</string>
+    <string name="application_size_label">"Program"</string>
+    <string name="data_size_label">"Data"</string>
+    <string name="uninstall_text">"Afinstaller"</string>
+    <string name="clear_user_data_text">"Ryd data"</string>
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
+    <string name="auto_launch_enable_text">"Du har valgt at starte dette program som standard for nogle handlinger."</string>
+    <string name="auto_launch_disable_text">"Der er ikke indstillet nogen standarder."</string>
+    <string name="clear_activities">"Ryd standarder"</string>
+    <string name="unknown">"Ukendt"</string>
+    <string name="sort_order_alpha">"Sorter"</string>
+    <string name="sort_order_size">"Sorter efter størrelse"</string>
+    <string name="manage_space_text">"Administrer plads"</string>
+    <string name="filter">"Filter"</string>
+    <string name="filter_dlg_title">"Vælg filtervalgmuligheder"</string>
+    <string name="filter_apps_all">"Alle"</string>
+    <string name="filter_apps_third_party">"Tredjeparts"</string>
+    <string name="filter_apps_running">"Kørende"</string>
+    <string name="loading">"Indlæser ..."</string>
+    <string name="recompute_size">"Beregner størrelse igen ..."</string>
+    <string name="clear_data_dlg_title">"Slet"</string>
+    <string name="clear_data_dlg_text">"Alle de oplysninger, du har gemt i dette program, slettes permanent."</string>
+    <string name="dlg_ok">"OK"</string>
+    <string name="dlg_cancel">"Annuller"</string>
+    <string name="app_not_found_dlg_title">"Programmet blev ikke fundet"</string>
+    <string name="app_not_found_dlg_text">"Programmet blev ikke fundet på listen over installerede programmer."</string>
+    <string name="clear_data_failed">"Programdata kunne ikke ryddes."</string>
+    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
+    <skip />
+    <string name="security_settings_desc">"Dette program kan få adgang til følgende på din telefon:"</string>
+    <string name="computing_size">"Beregner ..."</string>
+    <string name="invalid_size_value">"Pakkestørrelse kunne ikke beregnes"</string>
+    <string name="empty_list_msg">"Du har ikke installeret nogen tredjepartsprogrammer."</string>
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
+    <string name="language_settings">"Landestandard og tekst"</string>
+    <string name="language_settings_summary">"Indstil landestandard (land og område), tekstinput og valgmuligheder for automatisk retning"</string>
+    <string name="language_category">"Landestandardindstilling"</string>
+    <string name="text_category">"Tekstindstillinger"</string>
+    <string name="phone_language">"Vælg landestandard"</string>
+    <string name="phone_language_summary">"Vælg sprog og område"</string>
+    <string name="auto_replace">"Automatisk erstatning"</string>
+    <string name="auto_replace_summary">"Ret ord, der er stavet forkert"</string>
+    <string name="auto_caps">"Skriv automatisk med stort"</string>
+    <string name="auto_caps_summary">"Skriv første bogstav i sætninger med stort"</string>
+    <string name="auto_punctuate">"Automatisk tegnsætning"</string>
+    <string name="hardkeyboard_category">"Indstillinger for fysisk tastatur"</string>
+    <string name="auto_punctuate_summary">"Tryk på mellemrumstasten to gange for at indsætte \".\""</string>
+    <string name="show_password">"Synlig adgangskode"</string>
+    <string name="show_password_summary">"Vis adgangskode, mens du indtaster"</string>
+    <string name="ime_security_warning">"Inputmetoden vil muligvis være i stand til at indsamle al den tekst, du indtaster, inklusive personlige data som adgangskoder og kreditkortnumre. Den kommer fra programmet <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Aktiver denne inputmetode?"</string>
+    <string name="user_dict_settings_titlebar">"Brugerordbog"</string>
+    <string name="user_dict_settings_title">"Brugerordbog"</string>
+    <string name="user_dict_settings_summary">"Tilføj og fjern ord fra brugerordbogen"</string>
+    <string name="user_dict_settings_add_menu_title">"Tilføj"</string>
+    <string name="user_dict_settings_add_dialog_title">"Føj til ordbog"</string>
+    <string name="user_dict_settings_edit_dialog_title">"Rediger ord"</string>
+    <string name="user_dict_settings_context_menu_edit_title">"Rediger"</string>
+    <string name="user_dict_settings_context_menu_delete_title">"Slet"</string>
+    <string name="user_dict_settings_empty_text">"Du har ikke nogen ord i brugerordbogen. Du kan tilføje et ord gennem menuen."</string>
+    <string name="testing">"Tester"</string>
+    <string name="testing_phone_info">"Telefonoplysninger"</string>
+    <string name="testing_battery_info">"Batterioplysninger"</string>
+    <string name="testing_battery_history">"Batterioversigt"</string>
+    <string name="quick_launch_title">"Hurtig start"</string>
+    <string name="quick_launch_summary">"Indstil tastaturgenveje til at starte programmer"</string>
+    <string name="quick_launch_assign_application">"Tildel program"</string>
+    <string name="quick_launch_no_shortcut">"Ingen genvej"</string>
+    <string name="quick_launch_shortcut">"Søg + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
+    <string name="quick_launch_clear_dialog_title">"Ryd"</string>
+    <string name="quick_launch_clear_dialog_message">"Din genvej til <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) ryddes."</string>
+    <string name="quick_launch_clear_ok_button">"OK"</string>
+    <string name="quick_launch_clear_cancel_button">"Annuller"</string>
+    <string name="quick_launch_display_mode_applications">"Programmer"</string>
+    <string name="quick_launch_display_mode_shortcuts">"Genveje"</string>
+    <string name="input_methods_settings_title">"Tekstinput"</string>
+    <string name="input_methods_settings_summary">"Administrer valgmuligheder for tekstinput"</string>
+    <string name="input_methods_settings_label_format">"<xliff:g id="IME_NAME">%1$s</xliff:g> indstillinger"</string>
+    <string name="onscreen_keyboard_settings_summary">"Indstillinger for skærmtastatur"</string>
+    <string name="builtin_keyboard_settings_title">"Enhedstastatur"</string>
+    <string name="builtin_keyboard_settings_summary">"Indstillinger for indbygget tastatur"</string>
+    <string name="development_settings_title">"Udvikling"</string>
+    <string name="development_settings_summary">"Indstil valgmuligheder for programudvikling"</string>
+    <string name="enable_adb">"USB-fejlretning"</string>
+    <string name="enable_adb_summary">"Fejlretningstilstand, når USB er forbundet"</string>
+    <string name="keep_screen_on">"Forbliv vågen"</string>
+    <string name="keep_screen_on_summary">"Skærmen går aldrig i dvale, når der lades op"</string>
+    <string name="allow_mock_location">"Tillad imiterede placeringer"</string>
+    <string name="allow_mock_location_summary">"Tillad imiterede placeringer"</string>
+    <!-- no translation found for adb_warning_title (1756027479229533250) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (5352555112049663033) -->
+    <skip />
+    <string name="gadget_picker_title">"Vælg gadget"</string>
+    <string name="widget_picker_title">"Vælg widget"</string>
+    <string name="battery_history_details_for">"Detaljer for UID %d"</string>
+    <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
+    <string name="battery_history_network_usage">"Netværksbrugsdetaljer for <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
+    <string name="battery_history_bytes_received">"Modtagne bytes: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_sent">"Sendte bytes: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_total">"Bytes i alt: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_cpu_usage">"CPU-brugsdetaljer for <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
+    <string name="battery_history_user_time">"Brugertid:"</string>
+    <string name="battery_history_system_time">"Systemtid:"</string>
+    <string name="battery_history_total_time">"Tid i alt:"</string>
+    <string name="battery_history_starts">"Start: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
+    <string name="battery_history_packages_sharing_this_uid">"Pakker, der deler denne UID:"</string>
+    <string name="battery_history_no_data">"Der er ingen tilgængelige batteribrugsdata"</string>
+    <string name="battery_history_sensor">"Sensor:"</string>
+    <string name="battery_history_wakelock">"Delvis Wakelock:"</string>
+    <string name="battery_history_used_by_packages">"Sensor brugt af pakker:"</string>
+    <string name="battery_history_sensor_usage">"Brugt <xliff:g id="COUNT">%1$d</xliff:g> gange af <xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
+    <string name="battery_history_sensor_usage_multi">"Brugt <xliff:g id="COUNT">%1$d</xliff:g> gange af en af:"</string>
+    <string name="battery_history_awake_label">"Kørende"</string>
+    <string name="battery_history_screen_on_label">"Skærm til"</string>
+    <string name="battery_history_phone_on_label">"Telefon til"</string>
+    <string name="battery_history_awake">"Tid brugt uden dvale:"</string>
+    <string name="battery_history_screen_on">"Tid brugt med skærmen tændt:"</string>
+    <string name="battery_history_phone_on">"Tid brugt med telefonen tændt:"</string>
+    <string name="battery_history_screen_on_battery">"På batteri:"</string>
+    <string name="battery_history_screen_on_plugged">"Tilsluttet:"</string>
+    <string name="usage_stats_label">"Brugerstatistikker"</string>
+    <string name="testing_usage_stats">"Brugerstatistikker"</string>
+    <string name="display_order_text">"Sorter efter:"</string>
+    <string name="app_name_label">"Program"</string>
+    <string name="launch_count_label">"Optælling"</string>
+    <string name="usage_time_label">"Brugstid"</string>
+    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
+    <skip />
+    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
+    <skip />
+    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
+    <skip />
+    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (4630925382578609056) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
+    <skip />
+    <!-- no translation found for usage_name_percent (1899151069711662289) -->
+    <skip />
+    <!-- no translation found for details_title (7564809986329021063) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (2353149143338929583) -->
+    <skip />
+    <!-- no translation found for power_wifi (2382791137776486974) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (7052979399415080971) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
+    <skip />
+    <!-- no translation found for battery_action_display (5302763261448580102) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3003604969548979254) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (1834412555123982714) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for tts_settings (6454363854545277027) -->
+    <skip />
+    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (5064947197040356736) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_demo (405357591189935876) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for gadget_title (7455548605888590466) -->
+    <skip />
+    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
+    <skip />
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
+    <skip />
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
+    <skip />
+    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
+    <skip />
+    <!-- no translation found for vpn_no_button (7620339571187119107) -->
+    <skip />
+    <!-- no translation found for vpn_back_button (192036339792734970) -->
+    <skip />
+    <!-- no translation found for vpn_mistake_button (1759404628590603933) -->
+    <skip />
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <!-- no translation found for vpn_connecting (8039521381692090116) -->
+    <skip />
+    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
+    <skip />
+    <!-- no translation found for vpn_connected (7641723116362845781) -->
+    <skip />
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
+</resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 8e8c5c5..eabded7 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -32,18 +32,44 @@
     <item>"10 Minuten"</item>
     <item>"Kein Timeout"</item>
   </string-array>
+  <string-array name="tts_rate_entries">
+    <item>"Sehr langsam"</item>
+    <item>"Langsam"</item>
+    <item>"Normal"</item>
+    <item>"Schnell"</item>
+    <item>"Sehr schnell"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item>"Sehr niedrig"</item>
+    <item>"Niedrig"</item>
+    <item>"Normal"</item>
+    <item>"Hoch"</item>
+    <item>"Sehr hoch"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item>"Englisch (USA)"</item>
+    <item>"Englisch (UK)"</item>
+    <item>"Französisch"</item>
+    <item>"Deutsch"</item>
+    <item>"Italienisch"</item>
+    <item>"Spanisch"</item>
+  </string-array>
   <string-array name="wifi_security_entries">
     <item>"Autom."</item>
     <item>"Keine"</item>
     <item>"WEP"</item>
     <item>"WPA Personal"</item>
     <item>"WPA2 Personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item>"Keine"</item>
     <item>"WEP"</item>
     <item>"WPA Personal"</item>
     <item>"WPA2 Personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item>"Autom."</item>
@@ -73,4 +99,19 @@
     <item>"Startzähler"</item>
     <item>"Name der Anwendung"</item>
   </string-array>
+  <string-array name="wifi_eap_entries">
+    <item>"PEAP"</item>
+    <item>"TLS"</item>
+    <item>"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item>"Keine"</item>
+    <item>"PAP"</item>
+    <item>"MSCHAP"</item>
+    <item>"MSCHAP2"</item>
+    <item>"GTC"</item>
+  </string-array>
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a936059..da1cc44 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,12 +16,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Unbekannt"</string>
-    <string name="turn_on_radio">"Radio einschalten"</string>
-    <string name="turn_off_radio">"Radio ausschalten"</string>
+    <string name="turn_on_radio">"Mobilfunkverbindung aktivieren"</string>
+    <string name="turn_off_radio">"Mobilfunkverbindung deaktivieren"</string>
     <string name="turn_on_qxdm">"QXDM-SD-Protokoll aktivieren"</string>
     <string name="turn_off_qxdm">"QXDM-SD-Protokoll deaktivieren"</string>
     <string name="radioInfo_menu_viewADN">"SIM-Adressbuch anzeigen"</string>
-    <string name="radioInfo_menu_viewFDN">"Feste Rufnummern anzeigen"</string>
+    <string name="radioInfo_menu_viewFDN">"Begrenzte Rufnummern anzeigen"</string>
     <string name="radioInfo_menu_viewSDN">"Servicerufnummern anzeigen"</string>
     <string name="radioInfo_menu_getPDP">"PDP-Liste abrufen"</string>
     <string name="radioInfo_menu_enableData">"Datenverbindung aktivieren"</string>
@@ -31,7 +31,7 @@
     <string name="radioInfo_service_in">"In Betrieb"</string>
     <string name="radioInfo_service_out">"Außer Betrieb"</string>
     <string name="radioInfo_service_emergency">"Nur Notrufe"</string>
-    <string name="radioInfo_service_off">"Radio aus"</string>
+    <string name="radioInfo_service_off">"Mobilfunkverbindung aus"</string>
     <string name="radioInfo_roaming_in">"Roaming"</string>
     <string name="radioInfo_roaming_not">"Kein Roaming"</string>
     <string name="radioInfo_phone_idle">"Inaktiv"</string>
@@ -82,9 +82,9 @@
     <string name="battery_info_health_over_voltage">"Überspannung"</string>
     <string name="battery_info_health_unspecified_failure">"Unbekannter Fehler"</string>
     <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_visibility">"Erkennbar"</string>
+    <string name="bluetooth_visibility">"Sichtbar"</string>
     <string name="bluetooth_is_discoverable">"Für <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> Sekunden sichtbar..."</string>
-    <string name="bluetooth_not_discoverable">"Geräteerkennung deaktivieren"</string>
+    <string name="bluetooth_not_discoverable">"Gerät sichtbar machen"</string>
     <string name="bluetooth_devices">"Bluetooth-Geräte"</string>
     <string name="bluetooth_device_name">"Gerätename"</string>
     <string name="bluetooth_name_not_set">"Kein Name festgelegt, Kontoname wird verwendet"</string>
@@ -107,7 +107,10 @@
     <string name="date_and_time">"Einstellungen"</string>
     <string name="date_time_12_hour_sample">"1:00"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Zeit einstellen"</string>
+    <string name="date_time_changeDate_text">"Datum"</string>
     <string name="choose_timezone">"Zeitzone auswählen"</string>
+    <string name="normal_date_format">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label">"Vorschau:"</string>
     <string name="display_font_size_label">"Schriftgröße:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -144,7 +147,7 @@
     <string name="radio_info_signal_strength_label">"Signalstärke:"</string>
     <string name="radio_info_call_status_label">"Rufstatus:"</string>
     <string name="radio_info_ppp_sent_label">"PPP gesendet:"</string>
-    <string name="radio_info_radio_resets_label">"Radiozurücksetzung:"</string>
+    <string name="radio_info_radio_resets_label">"Verbindungszurücksetzung"</string>
     <string name="radio_info_message_waiting_label">"Nachricht liegt vor:"</string>
     <string name="radio_info_phone_number_label">"Telefonnummer:"</string>
     <string name="radio_info_band_mode_label">"Frequenzbereich auswählen"</string>
@@ -188,12 +191,23 @@
     <string name="proxy_settings_label">"Proxy-Einstellungen"</string>
     <string name="cancel">"Abbrechen"</string>
     <string name="settings_label">"Einstellungen"</string>
+    <string name="settings_shortcut">"Einstellungen"</string>
     <string name="airplane_mode">"Flugmodus"</string>
     <string name="airplane_mode_summary">"Alle drahtlosen Verbindungen deaktivieren"</string>
     <string name="airplane_mode_turning_on">"Wireless-Verbindungen werden deaktiviert..."</string>
     <string name="airplane_mode_turning_off">"Wireless-Verbindungen werden aktiviert..."</string>
     <string name="radio_controls_title">"Wireless"</string>
-    <string name="radio_controls_summary">"WLAN, Bluetooth, Flugmodus und mobile Netzwerke verwalten"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <string name="roaming">"Daten-Roaming"</string>
+    <string name="roaming_enable">"Bei Roaming mit Datendienst verbinden"</string>
+    <string name="roaming_disable">"Bei Roaming mit Datendienst verbinden"</string>
+    <string name="roaming_reenable_message">"Die Datenkonnektivität wurde unterbrochen, da Sie Ihr Heimnetzwerk verlassen haben und Daten-Roaming nicht aktiviert ist."</string>
+    <string name="roaming_turn_it_on_button">"Aktivieren"</string>
+    <string name="roaming_warning">"Daten-Roaming zulassen? Es können beträchtliche Roaming-Gebühren anfallen!"</string>
+    <string name="roaming_reenable_title">"Achtung"</string>
+    <string name="networks">"Netzbetreiberauswahl"</string>
+    <string name="sum_carrier_select">"Netzbetreiber auswählen"</string>
     <string name="date_and_time_settings_title">"Datum und Uhrzeit"</string>
     <string name="date_and_time_settings_summary">"Datum, Uhrzeit, Zeitzone und Formate festlegen"</string>
     <string name="date_time_auto">"Automatisch"</string>
@@ -207,7 +221,8 @@
     <string name="zone_list_menu_sort_alphabetically">"Alphabetisch sortieren"</string>
     <string name="zone_list_menu_sort_by_timezone">"Nach Zeitzone sortieren"</string>
     <string name="security_settings_title">"Sicherheit und Standort"</string>
-    <string name="security_settings_summary">"Meinen Standort, Display-Entsperrung und SIM-Kartensperrung festlegen"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"Passwörter"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Bluetooth aktivieren"</string>
@@ -220,6 +235,8 @@
     <string name="bluetooth_error_title">"Achtung"</string>
     <string name="bluetooth_pairing_error_message">"Beim Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten."</string>
     <string name="bluetooth_pairing_pin_error_message">"Beim Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten, da die eingegebene PIN falsch ist."</string>
+    <string name="bluetooth_pairing_device_down_error_message">"Verbindung mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kann nicht hergestellt werden."</string>
+    <string name="bluetooth_pairing_rejected_error_message">"Verbindung wurde von <xliff:g id="DEVICE_NAME">%1$s</xliff:g> abgelehnt."</string>
     <string name="bluetooth_connecting_error_message">"Beim Verbindungsaufbau mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten."</string>
     <string name="bluetooth_preference_scan_title">"Scan nach Geräten"</string>
     <string name="bluetooth_device_context_connect">"Verbinden"</string>
@@ -244,7 +261,7 @@
     <string name="bluetooth_headset_profile_summary_use_for">"Für Audiosystem des Telefons verwenden"</string>
     <string name="wifi">"WLAN"</string>
     <string name="wifi_quick_toggle_title">"WLAN"</string>
-    <string name="wifi_quick_toggle_summary">"Wi-Fi aktivieren"</string>
+    <string name="wifi_quick_toggle_summary">"WLAN aktivieren"</string>
     <string name="wifi_settings">"WLAN-Einstellungen"</string>
     <string name="wifi_settings_category">"WLAN-Einstellungen"</string>
     <string name="wifi_settings_summary">"Wireless-Zugangspunkte festlegen und verwalten"</string>
@@ -260,11 +277,15 @@
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <string name="wifi_security_wpa_eap">"WPA-EAP"</string>
+    <string name="wifi_security_ieee8021x">"IEEE8021X"</string>
     <string name="wifi_security_unknown">"Unbekannt"</string>
-    <string name="wifi_security_verbose_open">"Offenes Netzwerk"</string>
-    <string name="wifi_security_verbose_wep">"Gesichert mit WEP"</string>
-    <string name="wifi_security_verbose_wpa">"Gesichert mit WPA"</string>
-    <string name="wifi_security_verbose_wpa2">"Gesichert mit WPA2"</string>
+    <string name="wifi_security_verbose_open">"offenes Netzwerk"</string>
+    <string name="wifi_security_verbose_wep">"gesichert mit WEP"</string>
+    <string name="wifi_security_verbose_wpa">"gesichert mit WPA"</string>
+    <string name="wifi_security_verbose_wpa2">"gesichert mit WPA2"</string>
+    <string name="wifi_security_verbose_wpa_eap">"gesichert mit WPA-EAP"</string>
+    <string name="wifi_security_verbose_ieee8021x">"gesichert mit IEEE 802.1x"</string>
     <string name="ip_address">"IP-Adresse"</string>
     <string name="signal">"Signalstärke"</string>
     <string name="wifi_starting">"Aktivierung..."</string>
@@ -277,19 +298,26 @@
     <string name="error_saving">"Netzwerk kann nicht gespeichert werden"</string>
     <string name="connect">"Verbinden"</string>
     <string name="connect_to_blank">"Mit <xliff:g id="NETWORK_NAME">%1$s</xliff:g> verbinden"</string>
+    <string name="please_select_eap">"EAP-Methode"</string>
+    <string name="please_select_phase2">"Phase 2-Authentifizierung"</string>
+    <string name="please_type_identity">"Identität"</string>
+    <string name="please_type_anonymous_identity">"Anonyme Identität"</string>
+    <string name="please_select_client_certificate">"Client-Zertifikat"</string>
+    <string name="please_select_ca_certificate">"CA-Zertifikat"</string>
+    <string name="please_type_private_key_passwd">"Passwort für den privaten Schlüssel"</string>
     <string name="please_type_passphrase">"Passwort für Wireless-Zugang"</string>
     <string name="please_type_hex_key">"WEP Hexadezimalschlüssel (0-9, A-F)"</string>
     <string name="wifi_show_password">"Passwort anzeigen"</string>
     <string name="scan_wifi">"Scannen"</string>
     <string name="summary_not_in_range">"Nicht in Reichweite"</string>
-    <string name="summary_remembered">"Gespeichert"</string>
+    <string name="summary_remembered">"gespeichert"</string>
     <string name="summary_connection_failed">"Verbindung fehlgeschlagen, versuchen Sie es erneut."</string>
     <string name="wifi_access_points">"WLAN-Netzwerke"</string>
     <string name="wifi_type_ssid">"Netzwerk-SSID"</string>
     <string name="wifi_security">"Sicherheit"</string>
     <string name="wifi_save_config">"Speichern"</string>
     <string name="wifi_password_unchanged">"(nicht geändert)"</string>
-    <string name="wifi_add_other_network">"Wi-Fi-Netzwerk hinzufügen"</string>
+    <string name="wifi_add_other_network">"WLAN-Netzwerk hinzufügen"</string>
     <string name="wifi_notify_open_networks">"Netzwerkhinweis"</string>
     <string name="wifi_notify_open_networks_summary">"Benachrichtigen, wenn ein offenes Netzwerk verfügbar ist"</string>
     <string name="wifi_password_incorrect_error">"Das eingegebene Netzwerkpasswort ist falsch. Bitte versuchen Sie es erneut."</string>
@@ -313,8 +341,8 @@
     <string name="wifi_setting_num_channels_summary">"Anzahl an zu verwendenden Kanälen festlegen"</string>
     <string name="wifi_setting_num_channels_error">"Beim Einrichten der Domain ist ein Problem aufgetreten."</string>
     <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> Kanäle"</string>
-    <string name="wifi_setting_sleep_policy_title">"Wi-Fi Standby-Richtlinie"</string>
-    <string name="wifi_setting_sleep_policy_summary">"Festlegen, wann von Wi-Fi auf mobile Daten umgeschaltet werden soll"</string>
+    <string name="wifi_setting_sleep_policy_title">"WLAN Standby-Richtlinie"</string>
+    <string name="wifi_setting_sleep_policy_summary">"Festlegen, wann von WLAN auf mobile Daten umgeschaltet werden soll"</string>
     <string name="wifi_setting_sleep_policy_error">"Beim Einrichten der Standby-Richtlinie ist ein Problem aufgetreten."</string>
     <string name="wifi_advanced_mac_address_title">"MAC-Adresse"</string>
     <string name="fragment_status_scanning">"Scannen…"</string>
@@ -333,7 +361,7 @@
     <string name="status_disconnecting">"Verbindung wird getrennt..."</string>
     <string name="status_disconnected">"Nicht verbunden"</string>
     <string name="status_failed">"Fehlgeschlagen"</string>
-    <string name="sound_and_display_settings">"Töne und Display"</string>
+    <string name="sound_and_display_settings">"Sound und Display"</string>
     <string name="sound_settings">"Toneinstellungen"</string>
     <string name="sound_and_display_settings_summary">"Klingeltöne, Benachrichtigungen und Helligkeit festlegen"</string>
     <string name="silent_mode_title">"Lautlosmodus"</string>
@@ -360,10 +388,13 @@
     <string name="sound_effects_enable_summary_on">"Ton bei Auswahl auf Display"</string>
     <string name="sound_effects_enable_summary_off">"Ton bei Auswahl auf Display"</string>
     <string name="play_media_notification_sounds_enable_title">"SD-Karten-Nachricht"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"SD-Karten-Benachrichtigungston deaktivieren"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"SD-Karten-Benachrichtigungston aktivieren"</string>
+    <string name="play_media_notification_sounds_enable_summary_on">"Ton bei SD-Karten-Benachrichtigungen"</string>
+    <string name="play_media_notification_sounds_enable_summary_off">"Ton bei SD-Karten-Benachrichtigungen"</string>
     <string name="sync_settings">"Datensynchronisierung"</string>
     <string name="sync_settings_summary">"Auswählen, welche Anwendungen synchronisiert werden"</string>
+    <string name="search_settings">"Suchen"</string>
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"Display-Einstellungen"</string>
     <string name="animations_title">"Animation"</string>
     <string name="animations_summary_on">"Animation beim Öffnen und Schließen von Fenstern anzeigen"</string>
@@ -401,18 +432,26 @@
     <string name="system_update_settings_list_item_summary">"Nach Systemaktualisierungen suchen"</string>
     <string name="firmware_version">"Firmware-Version"</string>
     <string name="model_number">"Modellnummer"</string>
-    <string name="baseband_version">"Basisband-Version"</string>
+    <string name="baseband_version">"Baseband-Version"</string>
     <string name="kernel_version">"Kernel-Version"</string>
     <string name="build_number">"Build-Nummer"</string>
     <string name="device_info_not_available">"Nicht verfügbar"</string>
     <string name="device_status_activity_title">"Status"</string>
     <string name="device_status">"Status"</string>
-    <string name="device_status_summary">"IMEI, Telefonnummer, Signal usw."</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
     <string name="storage_settings_title">"SD-Karte und Speicher"</string>
     <string name="storage_settings_summary">"SD-Karte entnehmen, verfügbaren Speicher anzeigen"</string>
-    <string name="status_number">"Telefonnummer"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"Mobiler Netzwerktyp"</string>
-    <string name="status_data_state">"Status des mobilen Netzwerks"</string>
+    <string name="status_data_state">"Mobiler Netzwerkstatus"</string>
     <string name="status_service_state">"Servicestatus"</string>
     <string name="status_signal_strength">"Signalstärke"</string>
     <string name="status_roaming">"Roaming"</string>
@@ -464,9 +503,10 @@
     <string name="restore_default_apn_completed">"Zurücksetzen auf Standard-APN-Einstellungen abgeschlossen"</string>
     <string name="master_clear_title">"Auf Werkszustand zurück"</string>
     <string name="master_clear_summary">"Löscht alle Daten auf dem Telefon"</string>
-    <string name="master_clear_desc">"Durch diese Aktion wird das Telefon auf den Werkszustand zurückgesetzt. Alle Daten und heruntergeladenen Anwendungen werden gelöscht!"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
     <string name="master_clear_button_text">"Telefon zurücksetzen"</string>
-    <string name="master_clear_final_desc">"Telefon zurücksetzen und alle Ihre Daten und Anwendungen löschen? Die Aktion kann nicht rückgängig gemacht werden!"</string>
+    <string name="master_clear_final_desc">"Alle persönlichen Daten und heruntergeladenen Anwendungen löschen? Diese Aktion kann nicht rückgängig gemacht werden."</string>
     <string name="master_clear_final_button_text">"Alles löschen"</string>
     <string name="master_clear_gesture_prompt">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
     <string name="master_clear_gesture_explanation">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen des Telefons zu bestätigen."</string>
@@ -480,16 +520,21 @@
     <string name="media_format_gesture_prompt">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
     <string name="media_format_gesture_explanation">"Sie müssen Ihr Entsperrungsmuster eingeben, um eine SD-Karten-Formatierung zu bestätigen."</string>
     <string name="call_settings_title">"Anrufeinstellungen"</string>
-    <string name="call_settings_summary">"Mailbox, Anrufweiterleitung, Anklopfen, Anruferkennung einrichten"</string>
+    <string name="call_settings_summary">"Mailbox, Rufweiterleitung, Anklopfen, Anruferkennung einrichten"</string>
     <string name="network_settings_title">"Mobile Netzwerke"</string>
     <string name="network_settings_summary">"Optionen für Roaming, Netzwerke, APNs festlegen"</string>
-    <string name="location_title">"Standortquellen"</string>
+    <string name="location_title">"Mein Standort"</string>
     <string name="location_network_based">"Wireless nutzen"</string>
     <string name="location_networks_disabled">"Standort über Wireless-Netzwerke anzeigen (z.B. in Google Maps)"</string>
     <string name="location_neighborhood_level">"Standort bestimmt von WLAN und/oder mobilen Netzwerken"</string>
     <string name="location_gps">"GPS-Satelliten aktivieren"</string>
     <string name="location_street_level">"Auf Straßenebene lokalisieren (deaktivieren, um Akku zu sparen)"</string>
     <string name="location_gps_disabled">"Auf Straßenebene lokalisieren (höherer Akkuverbrauch, im Freien)"</string>
+    <string name="use_location_title">"Für Google freigeben"</string>
+    <string name="use_location_summary">"Google erlauben, den Standort für verbesserte Suchergebnisse und andere Dienste zu verwenden"</string>
+    <string name="use_location_warning_message">"Google erlauben, den Standort für verbesserte Suchergebnisse und andere Dienste zu verwenden"</string>
+    <string name="agree">"Zustimmen"</string>
+    <string name="disagree">"Ablehnen"</string>
     <string name="about_settings">"Telefoninfo"</string>
     <string name="about_settings_summary">"Rechtliche Hinweise, Telefonstatus und Softwareversion anzeigen"</string>
     <string name="legal_information">"Rechtliche Hinweise"</string>
@@ -555,6 +600,7 @@
     <string name="data_size_label">"Daten"</string>
     <string name="uninstall_text">"Deinstallieren"</string>
     <string name="clear_user_data_text">"Daten löschen"</string>
+    <string name="app_factory_reset">"Updates deinstallieren"</string>
     <string name="auto_launch_enable_text">"Sie haben diese Anwendung für einige Aktionen als Standard festgelegt."</string>
     <string name="auto_launch_disable_text">"Kein Standard"</string>
     <string name="clear_activities">"Standardeinstellung löschen"</string>
@@ -576,10 +622,15 @@
     <string name="app_not_found_dlg_title">"Anwendung nicht gefunden"</string>
     <string name="app_not_found_dlg_text">"Diese Anwendung wurde in der Liste der installierten Anwendungen nicht gefunden."</string>
     <string name="clear_data_failed">"Anwendungsdaten können nicht gelöscht werden."</string>
+    <string name="app_factory_reset_dlg_title">"Updates deinstallieren"</string>
+    <string name="app_factory_reset_dlg_text">"Möchten Sie alle Updates für diese Android-Systemanwendung deinstallieren?"</string>
+    <string name="clear_failed_dlg_title">"Daten löschen"</string>
+    <string name="clear_failed_dlg_text">"Daten konnten für die Anwendung nicht gelöscht werden."</string>
     <string name="security_settings_desc">"Diese Anwendung kann auf die folgenden Funktionen Ihres Telefons zugreifen:"</string>
     <string name="computing_size">"Berechnung..."</string>
     <string name="invalid_size_value">"Paketgröße kann nicht berechnet werden"</string>
     <string name="empty_list_msg">"Sie haben keine Anwendungen von Drittanbietern installiert."</string>
+    <string name="version_text">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="language_settings">"Gebietsschema und Text"</string>
     <string name="language_settings_summary">"Optionen für Sprache und Region, Texteingabe und Autokorrektur festlegen"</string>
     <string name="language_category">"Ländereinstellung"</string>
@@ -634,6 +685,8 @@
     <string name="keep_screen_on_summary">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
     <string name="allow_mock_location">"Falsche Standorte"</string>
     <string name="allow_mock_location_summary">"Falsche Standorte zulassen"</string>
+    <string name="adb_warning_title">"USB-Debugging aktivieren?"</string>
+    <string name="adb_warning_message">"USB-Debugging ist nur für Entwicklungszwecke vorgesehen. Damit können Sie Daten zwischen Ihrem Computer und Ihrem Gerät kopieren, Anwendungen auf Ihrem Gerät ohne Benachrichtigung installieren und Protokolldaten lesen."</string>
     <string name="gadget_picker_title">"Gadget auswählen"</string>
     <string name="widget_picker_title">"Widget auswählen"</string>
     <string name="battery_history_details_for">"Details für UID %d"</string>
@@ -647,10 +700,10 @@
     <string name="battery_history_system_time">"Systemzeit:"</string>
     <string name="battery_history_total_time">"Gesamtzeit:"</string>
     <string name="battery_history_starts">"Startet: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> Tage, <xliff:g id="HOURS">%2$d</xliff:g> Stunden, <xliff:g id="MINUTES">%3$d</xliff:g> Minuten, <xliff:g id="SECONDS">%4$d</xliff:g> Sekunden"</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> Stunden, <xliff:g id="MINUTES">%2$d</xliff:g> Minuten, <xliff:g id="SECONDS">%3$d</xliff:g> Sekunden"</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> Minuten, <xliff:g id="SECONDS">%2$d</xliff:g> Sekunden"</string>
-    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> Sekunden"</string>
+    <string name="battery_history_days">"<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>
+    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
+    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
+    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
     <string name="battery_history_packages_sharing_this_uid">"Pakete, die diese UID teilen:"</string>
     <string name="battery_history_no_data">"Keine Akku-Nutzungsdaten verfügbar"</string>
     <string name="battery_history_sensor">"Sensor:"</string>
@@ -672,4 +725,277 @@
     <string name="app_name_label">"Anwendung"</string>
     <string name="launch_count_label">"Anzahl"</string>
     <string name="usage_time_label">"Nutzungszeit"</string>
+    <string name="accessibility_settings_title">"Eingabehilfe"</string>
+    <string name="accessibility_settings_summary">"Optionen für Eingabehilfe verwalten"</string>
+    <string name="toggle_accessibility_title">"Eingabehilfen"</string>
+    <string name="accessibility_services_category">"Eingabehilfendienste"</string>
+    <string name="no_accessibility_services_summary">"Keine Eingabehilfen installiert"</string>
+    <string name="accessibility_service_security_warning">"Diese Eingabehilfe kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Kreditkartennummern, jedoch keine Passwörter. Sie kann auch Ihre Interaktionen auf der Benutzeroberfläche protokollieren. Sie ist Teil der Anwendung <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Soll diese Eingabehilfe aktiviert werden?"</string>
+    <string name="accessibility_service_disable_warning">"Eingabehilfe deaktivieren?"</string>
+    <string name="power_usage_summary_title">"Akkuverbrauch"</string>
+    <string name="power_usage_summary">"Akkuverbraucher"</string>
+    <string name="battery_since_unplugged">"Akkuverbrauch seit dem Ausstecken"</string>
+    <string name="battery_since_reset">"Akkuverbrauch seit dem Zurücksetzen"</string>
+    <string name="battery_stats_duration">"<xliff:g id="TIME">%1$s</xliff:g> seit dem Ausstecken"</string>
+    <string name="awake">"Aktivzeit des Geräts"</string>
+    <string name="wifi_on_time">"WLAN-Aktivzeit"</string>
+    <string name="bluetooth_on_time">"WLAN-Aktivzeit"</string>
+    <string name="usage_name_percent">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="PERCENT">%2$s</xliff:g> %%"</string>
+    <string name="details_title">"Akkuverbrauch - Details"</string>
+    <string name="details_subtitle">"Details verwenden"</string>
+    <string name="controls_subtitle">"Energieverbrauch anpassen"</string>
+    <string name="packages_subtitle">"Enthaltene Pakete"</string>
+    <string name="power_screen">"Display"</string>
+    <string name="power_wifi">"WLAN"</string>
+    <string name="power_bluetooth">"Bluetooth"</string>
+    <string name="power_cell">"Handy-Standby"</string>
+    <string name="power_phone">"Anrufe"</string>
+    <string name="power_idle">"Telefon inaktiv"</string>
+    <string name="usage_type_cpu">"CPU insgesamt"</string>
+    <string name="usage_type_cpu_foreground">"CPU-Vordergrund"</string>
+    <string name="usage_type_gps">"GPS"</string>
+    <string name="usage_type_phone">"Telefon"</string>
+    <string name="usage_type_data_send">"Gesendete Daten"</string>
+    <string name="usage_type_data_recv">"Empfangene Daten"</string>
+    <string name="usage_type_audio">"Audio"</string>
+    <string name="usage_type_video">"Video"</string>
+    <string name="usage_type_on_time">"Aktivzeit"</string>
+    <string name="battery_action_stop">"Stoppen erzwingen"</string>
+    <string name="battery_action_app_details">"Anwendungsinfo"</string>
+    <string name="battery_action_app_settings">"Anwendungseinstellungen"</string>
+    <string name="battery_action_display">"Display-Einstellungen"</string>
+    <string name="battery_action_wifi">"WLAN-Einstellungen"</string>
+    <string name="battery_action_bluetooth">"Bluetooth-Einstellungen"</string>
+    <string name="battery_desc_voice">"Akkuverbrauch durch Anrufe"</string>
+    <string name="battery_desc_standby">"Akkuverbrauch bei inaktivem Telefon"</string>
+    <string name="battery_desc_radio">"Akkuverbrauch durch Mobilfunk"</string>
+    <string name="battery_sugg_radio">"In den Flugmodus wechseln, um in Gebieten ohne Mobilfunkabdeckung Energie zu sparen"</string>
+    <string name="battery_desc_display">"Akkuverbrauch durch Display und Beleuchtung"</string>
+    <string name="battery_sugg_display">"Bildschirmhelligkeit und/oder Bildschirm-Timeout verringern"</string>
+    <string name="battery_desc_wifi">"Akkuverbrauch durch WLAN"</string>
+    <string name="battery_sugg_wifi">"WLAN bei Nichtverwendung oder Nichtverfügbarkeit deaktivieren"</string>
+    <string name="battery_desc_bluetooth">"Akkuverbrauch durch Bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic">"Bluetooth bei Nichtverwendung deaktivieren"</string>
+    <string name="battery_sugg_bluetooth_headset">"Mit einem anderen Bluetooth-Gerät verbinden"</string>
+    <string name="battery_desc_apps">"Akkuverbrauch bei ausgeführten Anwendungen"</string>
+    <string name="battery_sugg_apps_info">"Anwendung beenden oder deinstallieren"</string>
+    <string name="battery_sugg_apps_gps">"GPS bei Nichtverwendung deaktivieren"</string>
+    <string name="battery_sugg_apps_settings">"Die Anwendung bietet unter Umständen Einstellungen für einen geringeren Akkuverbrauch."</string>
+    <string name="menu_stats_unplugged">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> seit dem Ausstecken"</string>
+    <string name="menu_stats_last_unplugged">"Seit dem letzten Ausstecken für <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total">"Verbrauch insgesamt"</string>
+    <string name="menu_stats_refresh">"Aktualisieren"</string>
+    <string name="process_kernel_label">"Android OS"</string>
+    <string name="process_mediaserver_label">"Mediaserver"</string>
+    <string name="tts_settings">"Sprachsynthese"</string>
+    <string name="tts_settings_summary">"Text-in-Sprache einrichten"</string>
+    <string name="tts_settings_title">"Sprachsynthese-Steuerung"</string>
+    <string name="use_default_tts_settings_title">"Immer meine Einstellungen verwenden"</string>
+    <string name="use_default_tts_settings_summary">"Standardeinstellungen überschreiben Anwendungseinstellungen"</string>
+    <string name="tts_default_settings_section">"Standardeinstellungen"</string>
+    <string name="tts_default_rate_title">"Sprechgeschwindigkeit"</string>
+    <string name="tts_default_rate_summary">"Geschwindigkeit, mit der der Text gesprochen wird"</string>
+    <string name="tts_default_pitch_title">"Tonlage"</string>
+    <string name="tts_default_pitch_summary">"Beeinflusst den Klang des gesprochenen Texts"</string>
+    <string name="tts_default_lang_title">"Sprache"</string>
+    <string name="tts_default_lang_summary">"Legt die sprachenspezifische Stimme für den gesprochenen Text fest"</string>
+    <string name="tts_play_example_title">"Beispiel anhören"</string>
+    <string name="tts_play_example_summary">"Kurze Demonstration der Sprachsynthese abspielen"</string>
+    <string name="tts_install_data_title">"Sprachdaten installieren"</string>
+    <string name="tts_install_data_summary">"Sprachdaten für Sprachsynthese installieren"</string>
+    <string name="tts_data_installed_summary">"Die für die Sprachsynthese erforderlichen Stimmen sind bereits installiert."</string>
+    <string name="tts_demo">"Dies ist ein Beispiel für Sprachsynthese."</string>
+    <string name="tts_settings_changed_demo">"Ihre Einstellungen wurden geändert. Dies ist ein Klangbeispiel."</string>
+    <string name="gadget_title">"Energiesteuerung"</string>
+    <string name="vpn_settings_activity_title">"VPN-Einstellungen"</string>
+    <string name="vpn_connect_to">"Mit %s verbinden"</string>
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <string name="vpn_password_colon">"Passwort:"</string>
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <string name="vpn_connect_button">"Verbinden"</string>
+    <string name="vpn_yes_button">"Ja"</string>
+    <string name="vpn_no_button">"Nein"</string>
+    <string name="vpn_back_button">"Zurück"</string>
+    <string name="vpn_mistake_button">"Nein, das ist ein Fehler."</string>
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <string name="vpn_connecting">"Verbindung wird hergestellt..."</string>
+    <string name="vpn_disconnecting">"Verbindung wird getrennt..."</string>
+    <string name="vpn_connected">"Verbunden"</string>
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <string name="vpn_profile_added">"%s wurde hinzugefügt."</string>
+    <string name="vpn_profile_replaced">"Änderungen werden an %s vorgenommen."</string>
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-el-nokeys/strings.xml b/res/values-el-nokeys/strings.xml
new file mode 100644
index 0000000..bf9dfa3
--- /dev/null
+++ b/res/values-el-nokeys/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary">"Διαχείριση εφαρμογών"</string>
+</resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
new file mode 100644
index 0000000..c00bff1
--- /dev/null
+++ b/res/values-el/arrays.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item>"Αμερική"</item>
+    <item>"Ευρώπη"</item>
+    <item>"Αφρική"</item>
+    <item>"Ασία"</item>
+    <item>"Αυστραλία"</item>
+    <item>"Ειρηνικός"</item>
+    <item>"Όλα"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item>"15 δευτερόλεπτα"</item>
+    <item>"30 δευτερόλεπτα"</item>
+    <item>"1 λεπτό"</item>
+    <item>"2 λεπτά"</item>
+    <item>"10 λεπτά"</item>
+    <item>"Να μην λήγει ποτέ ο χρόνος σύνδεσης"</item>
+  </string-array>
+    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
+    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
+    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
+    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
+    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
+    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
+    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
+    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
+    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
+    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
+    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
+    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
+    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
+    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
+    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
+    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
+    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
+    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
+    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
+    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
+    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
+    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
+    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
+    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
+  <string-array name="wifi_wep_type">
+    <item>"Αυτόματο"</item>
+    <item>"WEP ASCII"</item>
+    <item>"WEP δεκαεξαδικός"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries">
+    <item>"Όταν η οθόνη απενεργοποιείται"</item>
+    <item>"Ποτέ όταν είναι συνδεδεμένο"</item>
+    <item>"Ποτέ"</item>
+  </string-array>
+  <string-array name="battery_history_type_spinner">
+    <item>"Χρήση CPU"</item>
+    <item>"Χρήση δικτύου"</item>
+    <item>"Χρήση GPS"</item>
+    <item>"Χρήση αισθητήρα"</item>
+    <item>"μερική χρήση αφύπνισης"</item>
+    <item>"Άλλη χρήση"</item>
+  </string-array>
+  <string-array name="battery_history_which_spinner">
+    <item>"Από την τελευταία φορά που αποσυνδέθηκε"</item>
+    <item>"Συνολικά από την εκκίνηση"</item>
+    <item>"Συνολικά για όλο το χρονικό διάστημα"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item>"Χρόνος χρήσης"</item>
+    <item>"Εκκίνηση καταμέτρησης"</item>
+    <item>"Όνομα εφαρμογής"</item>
+  </string-array>
+    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
+    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
+    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
+    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
+    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
+    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
+    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
+    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
new file mode 100644
index 0000000..4b48799
--- /dev/null
+++ b/res/values-el/strings.xml
@@ -0,0 +1,1146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="device_info_default">"Άγνωστο"</string>
+    <string name="turn_on_radio">"Ενεργοποίηση πομπού"</string>
+    <string name="turn_off_radio">"Απενεργοποίηση πομπού"</string>
+    <string name="turn_on_qxdm">"Ενεργοποίηση αρχείου καταγραφής QXDM SD"</string>
+    <string name="turn_off_qxdm">"Απενεργοποίηση αρχείου καταγραφής QXDM SD"</string>
+    <string name="radioInfo_menu_viewADN">"Προβολή βιβλίου διευθύνσεων κάρτας SIM"</string>
+    <string name="radioInfo_menu_viewFDN">"Προβολή καθορισμένων αριθμών κλήσης"</string>
+    <string name="radioInfo_menu_viewSDN">"Προβολή αριθμών κλήσης υπηρεσίας"</string>
+    <string name="radioInfo_menu_getPDP">"Λήψη λίστας PDP"</string>
+    <string name="radioInfo_menu_enableData">"Ενεργοποίηση σύνδεσης δεδομένων"</string>
+    <string name="radioInfo_menu_disableData">"Απενεργοποίηση σύνδεσης δεδομένων"</string>
+    <string name="radioInfo_menu_enableDataOnBoot">"Ενεργοποίηση δεδομένων κατά την εκκίνηση"</string>
+    <string name="radioInfo_menu_disableDataOnBoot">"Απενεργοποίηση δεδομένων κατά την εκκίνηση"</string>
+    <string name="radioInfo_service_in">"Σε υπηρεσία"</string>
+    <string name="radioInfo_service_out">"Εκτός υπηρεσίας"</string>
+    <string name="radioInfo_service_emergency">"Μόνο κλήσεις έκτακτης ανάγκης"</string>
+    <string name="radioInfo_service_off">"Πομπός απενεργοποιημένος"</string>
+    <string name="radioInfo_roaming_in">"Περιαγωγή"</string>
+    <string name="radioInfo_roaming_not">"Χωρίς περιαγωγή"</string>
+    <string name="radioInfo_phone_idle">"Κατάσταση αδράνειας"</string>
+    <string name="radioInfo_phone_ringing">"Ήχος κλήσης"</string>
+    <string name="radioInfo_phone_offhook">"Κλήση σε εξέλιξη"</string>
+    <string name="radioInfo_data_disconnected">"Αποσυνδέθηκε"</string>
+    <string name="radioInfo_data_connecting">"Σύνδεση"</string>
+    <string name="radioInfo_data_connected">"Συνδεδεμένο"</string>
+    <string name="radioInfo_data_suspended">"Σε αναστολή"</string>
+    <string name="radioInfo_unknown">"άγνωστο"</string>
+    <string name="radioInfo_display_packets">"pkts"</string>
+    <string name="radioInfo_display_bytes">"bytes"</string>
+    <string name="radioInfo_display_dbm">"dBm"</string>
+    <string name="radioInfo_display_asu">"asu"</string>
+    <string name="radioInfo_lac">"LAC"</string>
+    <string name="radioInfo_cid">"CID"</string>
+    <string name="sdcard_unmount">"Αποπροσάρτηση κάρτας SD"</string>
+    <string name="sdcard_format">"Διαμόρφωση κάρτας SD"</string>
+    <string name="small_font">"Μικρό"</string>
+    <string name="medium_font">"Μέτριο"</string>
+    <string name="large_font">"Μεγάλο"</string>
+    <string name="font_size_save">"OK"</string>
+    <string name="sdcard_setting">"Κάρτα SD"</string>
+    <string name="battery_info_status_label">"Κατάσταση μπαταρίας:"</string>
+    <string name="battery_info_scale_label">"Κλίμακα μπαταρίας:"</string>
+    <string name="battery_info_level_label">"Επίπεδο μπαταρίας:"</string>
+    <string name="battery_info_health_label">"Κατάσταση μπαταρίας:"</string>
+    <string name="battery_info_technology_label">"Τεχνολογία μπαταρίας:"</string>
+    <string name="battery_info_voltage_label">"Τάση μπαταρίας:"</string>
+    <string name="battery_info_voltage_units">"mV"</string>
+    <string name="battery_info_temperature_label">"Θερμοκρασία μπαταρίας:"</string>
+    <string name="battery_info_temperature_units">"° C"</string>
+    <string name="battery_info_uptime">"Χρόνος που παρήλθε από την εκκίνηση:"</string>
+    <string name="battery_info_awake_battery">"Χρόνος αφύπνισης στη μπαταρία:"</string>
+    <string name="battery_info_awake_plugged">"Ώρα αφύπνισης κατά τη φόρτιση:"</string>
+    <string name="battery_info_screen_on">"Χρόνος οθόνης ενεργοποιημένος:"</string>
+    <string name="battery_info_status_unknown">"Άγνωστο"</string>
+    <string name="battery_info_status_charging">"Φόρτιση"</string>
+    <string name="battery_info_status_charging_ac">"(AC)"</string>
+    <string name="battery_info_status_charging_usb">"(USB)"</string>
+    <string name="battery_info_status_discharging">"Αποφόρτιση"</string>
+    <string name="battery_info_status_not_charging">"Δεν φορτίζει"</string>
+    <string name="battery_info_status_full">"Πλήρης"</string>
+    <string name="battery_info_health_unknown">"Άγνωστο"</string>
+    <string name="battery_info_health_good">"Καλό"</string>
+    <string name="battery_info_health_overheat">"Υπερθέρμανση"</string>
+    <string name="battery_info_health_dead">"Νεκρό"</string>
+    <string name="battery_info_health_over_voltage">"Υπερβολική τάση"</string>
+    <string name="battery_info_health_unspecified_failure">"Άγνωστο σφάλμα"</string>
+    <string name="bluetooth">"Bluetooth"</string>
+    <string name="bluetooth_visibility">"Ανιχνεύσιμο"</string>
+    <string name="bluetooth_is_discoverable">"Ανιχνεύσιμο για <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> δευτερόλεπτα..."</string>
+    <string name="bluetooth_not_discoverable">"Να γίνει η συσκευή ανιχνεύσιμη"</string>
+    <string name="bluetooth_devices">"Συσκευές Bluetooth"</string>
+    <string name="bluetooth_device_name">"Όνομα συσκευής"</string>
+    <string name="bluetooth_name_not_set">"Δεν έχει οριστεί όνομα, χρήση ονόματος λογαριασμού"</string>
+    <string name="bluetooth_scan_for_devices">"Σάρωση για συσκευές"</string>
+    <string name="bluetooth_disconnect_blank">"Το <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί."</string>
+    <string name="bluetooth_connected">"Συνδεδεμένο"</string>
+    <string name="bluetooth_disconnected">"Αποσυνδέθηκε"</string>
+    <string name="bluetooth_disconnecting">"Αποσύνδεση..."</string>
+    <string name="bluetooth_connecting">"Σύνδεση..."</string>
+    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <skip />
+    <string name="bluetooth_not_connected">"Σύζευξη με αυτή τη συσκευή"</string>
+    <string name="bluetooth_pairing">"Σύζευξη..."</string>
+    <string name="bluetooth_paired">"Συζευγμένα αλλά όχι συνδεδεμένα"</string>
+    <string name="bluetooth_device">"σετ ακουστικού-μικροφώνου"</string>
+    <string name="progress_scanning">"Σάρωση"</string>
+    <string name="bluetooth_notif_ticker">"Αίτημα σύζευξης Bluetooth"</string>
+    <string name="bluetooth_notif_title">"Αίτημα σύζευξης"</string>
+    <string name="bluetooth_notif_message">"Επιλογή για σύζευξη με "</string>
+    <string name="date_and_time">"Ρυθμίσεις ημερομηνίας &amp; ώρας"</string>
+    <string name="date_time_12_hour_sample">"1:00 μμ"</string>
+    <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Αλλαγή ώρας"</string>
+    <string name="date_time_changeDate_text">"Ημερομηνία"</string>
+    <string name="choose_timezone">"Επιλογή ζώνης ώρας"</string>
+    <!-- no translation found for normal_date_format (1982904221918374153) -->
+    <skip />
+    <string name="display_preview_label">"Προεπισκόπηση:"</string>
+    <string name="display_font_size_label">"Μέγεθος γραμματοσειράς:"</string>
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text">"Αποστολή <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text">"Εκκίνηση <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label">"Λογαριασμός:"</string>
+    <string name="proxy_clear_text">"Εκκαθάριση"</string>
+    <string name="proxy_port_label">"Θύρα"</string>
+    <string name="proxy_defaultView_text">"Επαναφορά προεπιλογών"</string>
+    <string name="proxy_action_text">"Αποθήκευση"</string>
+    <string name="proxy_hostname_label">"Όνομα κεντρικού υπολογιστή"</string>
+    <string name="proxy_error">"Προσοχή"</string>
+    <string name="proxy_error_dismiss">"OK"</string>
+    <string name="proxy_error_invalid_host">"Το όνομα κεντρικού υπολογιστή που πληκτρολογήσατε δεν είναι έγκυρο."</string>
+    <string name="proxy_error_empty_port">"Πρέπει να συμπληρώσετε το πεδίο θύρας."</string>
+    <string name="proxy_error_empty_host_set_port">"Το πεδίο θύρας θα πρέπει να είναι κενό αν το πεδίο κεντρικού υπολογιστή είναι κενό."</string>
+    <string name="proxy_error_invalid_port">"Η θύρα που πληκτρολογήσατε δεν είναι έγκυρη."</string>
+    <string name="radio_info_signal_location_label">"Τοποθεσία:"</string>
+    <string name="radio_info_neighboring_location_label">"Γειτονικά CID:"</string>
+    <string name="radio_info_data_attempts_label">"Προσπάθειες δεδομένων:"</string>
+    <string name="radio_info_gprs_service_label">"Υπηρεσία GPRS:"</string>
+    <string name="radio_info_roaming_label">"Περιαγωγή:"</string>
+    <string name="radio_info_imei_label">"Αριθμός IMEI:"</string>
+    <string name="radio_info_call_redirect_label">"Ανακατεύθυνση κλήσης:"</string>
+    <string name="radio_info_ppp_resets_label">"Αριθμός επαναφορών PPP από την εκκίνηση:"</string>
+    <string name="radio_info_gsm_disconnects_label">"Αποσύνδεση GSM:"</string>
+    <string name="radio_info_current_network_label">"Τρέχον δίκτυο:"</string>
+    <string name="radio_info_data_successes_label">"Επιτυχή δεδομένα:"</string>
+    <string name="radio_info_ppp_received_label">"Λήψη PPP:"</string>
+    <string name="radio_info_gsm_service_label">"Υπηρεσία GSM:"</string>
+    <string name="radio_info_signal_strength_label">"Ισχύς σήματος:"</string>
+    <string name="radio_info_call_status_label">"Κατάσταση κλήσης:"</string>
+    <string name="radio_info_ppp_sent_label">"Αποστολή PPP:"</string>
+    <string name="radio_info_radio_resets_label">"Επαναφορές πομπού:"</string>
+    <string name="radio_info_message_waiting_label">"Αναμονή μηνύματος:"</string>
+    <string name="radio_info_phone_number_label">"Τηλεφωνικός αριθμός:"</string>
+    <string name="radio_info_band_mode_label">"Επιλογή μπάντας ραδιοφώνου"</string>
+    <string name="radio_info_network_type_label">"Τύπος δικτύου:"</string>
+    <string name="radio_info_set_perferred_label">"Ορισμός προτιμώμενου τύπου δικτύου:"</string>
+    <string name="radio_info_ping_ipaddr">"Ping IpAddr:"</string>
+    <string name="radio_info_ping_hostname">"Εκτέλεση εντολής ping σε όνομα κεντρικού υπολογιστή (www.google.gr):"</string>
+    <string name="radio_info_http_client_test">"Δοκιμή HTTP πελάτη:"</string>
+    <string name="radio_info_toggle_ciph_label">"Ενεργοποίηση κρυπτογράφησης"</string>
+    <string name="ping_test_label">"Εκτέλεση δοκιμής ping"</string>
+    <string name="radio_info_smsc_label">"SMSC:"</string>
+    <string name="radio_info_smsc_update_label">"Ενημέρωση"</string>
+    <string name="radio_info_smsc_refresh_label">"Ανανέωση"</string>
+    <string name="radio_info_toggle_dns_check_label">"Αλλαγή ελέγχου DNS"</string>
+    <string name="band_mode_title">"Ορισμός ζώνης GSM/UMTS"</string>
+    <string name="band_mode_loading">"Φόρτωση λίστας ζωνών..."</string>
+    <string name="band_mode_set">"Ορισμός"</string>
+    <string name="band_mode_failed">"Ανεπιτυχής"</string>
+    <string name="band_mode_succeeded">"Επιτυχής"</string>
+    <string name="sdcard_changes_instructions">"Οι αλλαγές θα πραγματοποιηθούν όταν πραγματοποιηθεί επανασύνδεση του καλωδίου USB"</string>
+    <string name="sdcard_settings_screen_mass_storage_text">"Ενεργοποίηση μέσου μαζικής αποθήκευσης USB"</string>
+    <string name="sdcard_settings_total_bytes_label">"Συνολικός αριθμός byte:"</string>
+    <string name="sdcard_settings_not_present_status">"Δεν υπάρχει κάρτα SD"</string>
+    <string name="sdcard_settings_available_bytes_label">"Διαθέσιμος αριθμός bytes:"</string>
+    <string name="sdcard_settings_mass_storage_status">"Η κάρτα SD χρησιμοποιείται ως συσκευή μαζικής αποθήκευσης"</string>
+    <string name="sdcard_settings_unmounted_status">"Μπορείτε να αφαιρέσετε την κάρτα SD με ασφάλεια"</string>
+    <string name="sdcard_settings_bad_removal_status">"Η κάρτα SD αφαιρέθηκε ενώ βρισκόταν σε χρήση!"</string>
+    <string name="sdcard_settings_used_bytes_label">"Αριθμός bytes που χρησιμοποιήθηκαν:"</string>
+    <string name="sdcard_settings_scanning_status">"Σάρωση κάρτας SD για πολυμέσα..."</string>
+    <string name="sdcard_settings_read_only_status">"Η κάρτα SD που προσαρτήθηκε είναι μόνο για ανάγνωση"</string>
+    <string name="next_label">"Επόμενο"</string>
+    <string name="language_picker_title">"Τοπικές ρυθμίσεις"</string>
+    <string name="select_your_language">"Επιλέξτε γλώσσα"</string>
+    <string name="activity_picker_label">"Επιλογή δραστηριότητας"</string>
+    <string name="device_info_label">"Πληροφορίες συσκευής"</string>
+    <string name="battery_info_label">"Πληροφορίες μπαταρίας"</string>
+    <string name="battery_history_label">"Ιστορικό μπαταρίας"</string>
+    <string name="display_label">"Προβολή"</string>
+    <string name="phone_info_label">"Πληροφορίες τηλεφώνου"</string>
+    <string name="sd_card_settings_label">"Κάρτα SD"</string>
+    <string name="proxy_settings_label">"Ρυθμίσεις διακομιστή μεσολάβησης"</string>
+    <string name="cancel">"Ακύρωση"</string>
+    <string name="settings_label">"Ρυθμίσεις"</string>
+    <!-- no translation found for settings_shortcut (3672145147925639262) -->
+    <skip />
+    <string name="airplane_mode">"Λειτουργία πτήσης"</string>
+    <string name="airplane_mode_summary">"Απενεργοποίηση όλων των ασύρματων συνδέσεων"</string>
+    <string name="airplane_mode_turning_on">"Απενεργοποίηση ασύρματων συνδέσεων..."</string>
+    <string name="airplane_mode_turning_off">"Ενεργοποίηση ασύρματων συνδέσεων..."</string>
+    <string name="radio_controls_title">"Στοιχεία ελέγχου ασύρματου"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
+    <string name="date_and_time_settings_title">"Ημερομηνία &amp; ώρα"</string>
+    <string name="date_and_time_settings_summary">"Ορισμός ημερομηνίας, ώρας, ζώνης ώρας &amp; μορφές"</string>
+    <string name="date_time_auto">"Αυτόματο"</string>
+    <string name="date_time_auto_summaryOn">"Χρήση τιμών που παρέχονται από δίκτυο"</string>
+    <string name="date_time_auto_summaryOff">"Χρήση τιμών που παρέχονται από το δίκτυο"</string>
+    <string name="date_time_24hour">"Χρήση μορφής 24ώρου"</string>
+    <string name="date_time_set_time">"Ορισμός ώρας"</string>
+    <string name="date_time_set_timezone">"Επιλογή ζώνης ώρας"</string>
+    <string name="date_time_set_date">"Ορισμός ημερομηνίας"</string>
+    <string name="date_time_date_format">"Επιλογή μορφής ημερομηνίας"</string>
+    <string name="zone_list_menu_sort_alphabetically">"Ταξινόμηση με βάση αλφαβητική σειρά"</string>
+    <string name="zone_list_menu_sort_by_timezone">"Ταξινόμηση με βάση ζώνη ώρας"</string>
+    <string name="security_settings_title">"Ασφάλεια &amp; τοποθεσία"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
+    <string name="security_passwords_title">"Κωδικοί πρόσβασης"</string>
+    <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_summary">"Ενεργοποίηση Bluetooth"</string>
+    <string name="bluetooth_settings">"Ρυθμίσεις Bluetooth"</string>
+    <string name="bluetooth_settings_title">"Ρυθμίσεις Bluetooth"</string>
+    <string name="bluetooth_settings_summary">"Διαχείριση συνδέσεων, ορισμός ονόματος συσκευής &amp; ανιχνευσιμότητα"</string>
+    <string name="bluetooth_pin_entry">"Αίτημα σύζευξης Bluetooth"</string>
+    <string name="bluetooth_device_info">"Πληροφορίες συσκευής Bluetooth"</string>
+    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Πληκτρολογήστε τον αριθμό PIN για σύζευξη."\n"(Δοκιμάστε 0000 ή 1234)."</string>
+    <string name="bluetooth_error_title">"Προσοχή"</string>
+    <string name="bluetooth_pairing_error_message">"Παρουσιάστηκε ένα πρόβλημα κατά τη σύζευξη με <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message">"Παρουσιάστηκε ένα πρόβλημα κατά τη σύζευξη με το <xliff:g id="DEVICE_NAME">%1$s</xliff:g> επειδή ο αριθμός PIN που πληκτρολογήσατε είναι εσφαλμένος."</string>
+    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
+    <skip />
+    <string name="bluetooth_connecting_error_message">"Παρουσιάστηκε ένα πρόβλημα κατά τη σύνδεση σε <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_preference_scan_title">"Ανίχνευση για συσκευές"</string>
+    <string name="bluetooth_device_context_connect">"Σύνδεση"</string>
+    <string name="bluetooth_device_context_disconnect">"Αποσύνδεση"</string>
+    <string name="bluetooth_device_context_pair_connect">"Σύζευξη &amp; σύνδεση"</string>
+    <string name="bluetooth_device_context_unpair">"Διακοπή σύζευξης"</string>
+    <string name="bluetooth_device_context_disconnect_unpair">"Αποσύνδεση &amp; διακοπή σύζευξης"</string>
+    <string name="bluetooth_device_context_connect_advanced">"Επιλογές..."</string>
+    <string name="bluetooth_connect_specific_profiles_title">"Σύνδεση σε..."</string>
+    <string name="bluetooth_profile_a2dp">"Πολυμέσα"</string>
+    <string name="bluetooth_profile_headset">"Τηλέφωνο"</string>
+    <string name="bluetooth_summary_connected_to_a2dp">"Συνδέθηκε σε ήχο πολυμέσων"</string>
+    <string name="bluetooth_summary_connected_to_headset">"Συνδεδεμένο στον ήχο τηλεφώνου"</string>
+    <string name="bluetooth_summary_connected_to_a2dp_headset">"Σύνδεση στο τηλέφωνο και στον ήχο πολυμέσων"</string>
+    <string name="bluetooth_device_advanced_title">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> επιλογές"</string>
+    <string name="bluetooth_device_advanced_online_mode_title">"Σύνδεση"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary">"Σύνδεση σε συσκευή Bluetooth"</string>
+    <string name="bluetooth_device_advanced_profile_header_title">"Προφίλ"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected">"Συνδέθηκε σε ήχο πολυμέσων"</string>
+    <string name="bluetooth_headset_profile_summary_connected">"Συνδεδεμένο στον ήχο τηλεφώνου"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for">"Χρήση για ήχο πολυμέσων"</string>
+    <string name="bluetooth_headset_profile_summary_use_for">"Χρήση για ήχο τηλεφώνου"</string>
+    <string name="wifi">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary">"Ενεργοποίηση Wi-Fi"</string>
+    <string name="wifi_settings">"Ρυθμίσεις Wi-Fi"</string>
+    <string name="wifi_settings_category">"Ρυθμίσεις Wi-Fi"</string>
+    <string name="wifi_settings_summary">"Ορισμός &amp; διαχείριση ασύρματων σημείων πρόσβασης"</string>
+    <string name="forget_network">"Να διαγραφεί από τη μνήμη"</string>
+    <string name="wifi_status">"Κατάσταση"</string>
+    <string name="wifi_link_speed">"Ταχύτητα"</string>
+    <string name="wifi_signal_3">"Εξαιρετικό"</string>
+    <string name="wifi_signal_2">"Καλό"</string>
+    <string name="wifi_signal_1">"Μέτρια"</string>
+    <string name="wifi_signal_0">"Κακό"</string>
+    <string name="security">"Ασφάλεια"</string>
+    <string name="wifi_security_open">"Άνοιγμα"</string>
+    <string name="wifi_security_wep">"WEP"</string>
+    <string name="wifi_security_wpa">"WPA"</string>
+    <string name="wifi_security_wpa2">"WPA2"</string>
+    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
+    <skip />
+    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
+    <skip />
+    <string name="wifi_security_unknown">"Άγνωστο"</string>
+    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
+    <skip />
+    <string name="ip_address">"Διεύθυνση IP"</string>
+    <string name="signal">"Ισχύς σήματος"</string>
+    <string name="wifi_starting">"Ενεργοποίηση..."</string>
+    <string name="wifi_stopping">"Απενεργοποίηση..."</string>
+    <string name="wifi_error">"Σφάλμα"</string>
+    <string name="error_starting">"Δεν είναι δυνατή η εκκίνηση του Wi-Fi"</string>
+    <string name="error_stopping">"Δεν είναι δυνατή η διακοπή του Wi-Fi"</string>
+    <string name="error_scanning">"Δεν είναι δυνατή η ανίχνευση για δίκτυα"</string>
+    <string name="error_connecting">"Δεν είναι δυνατή η σύνδεση στο δίκτυο"</string>
+    <string name="error_saving">"Δεν είναι δυνατή η αποθήκευση του δικτύου"</string>
+    <string name="connect">"Σύνδεση"</string>
+    <string name="connect_to_blank">"Σύνδεση σε <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for please_select_eap (4488240331626456338) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for please_type_identity (7061261155499513089) -->
+    <skip />
+    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
+    <skip />
+    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
+    <skip />
+    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
+    <skip />
+    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
+    <skip />
+    <string name="please_type_passphrase">"Κωδικός πρόσβασης ασύρματου"</string>
+    <string name="please_type_hex_key">"Δεκαεξαδικό κλειδί WEP (0-9, A-F)"</string>
+    <string name="wifi_show_password">"Εμφάνιση κωδικού πρόσβασης."</string>
+    <string name="scan_wifi">"Σάρωση"</string>
+    <string name="summary_not_in_range">"Εκτός εμβέλειας"</string>
+    <!-- no translation found for summary_remembered (6079941090549401742) -->
+    <skip />
+    <string name="summary_connection_failed">"Η σύνδεση δεν ήταν επιτυχής, επιλέξτε για να προσπαθήσετε ξανά"</string>
+    <string name="wifi_access_points">"Δίκτυα Wi-Fi"</string>
+    <string name="wifi_type_ssid">"Δίκτυο SSID"</string>
+    <string name="wifi_security">"Ασφάλεια"</string>
+    <string name="wifi_save_config">"Αποθήκευση"</string>
+    <string name="wifi_password_unchanged">"(δεν έγινε αλλαγή)"</string>
+    <string name="wifi_add_other_network">"Προσθήκη δικτύου Wi-Fi"</string>
+    <string name="wifi_notify_open_networks">"Ειδοποίηση δικτύου"</string>
+    <string name="wifi_notify_open_networks_summary">"Να ειδοποιούμαι όταν υπάρχει διαθέσιμο ανοικτό δίκτυο"</string>
+    <string name="wifi_password_incorrect_error">"Ο κωδικός πρόσβασης δικτύου που πληκτρολογήσατε είναι εσφαλμένος. Προσπαθήστε ξανά."</string>
+    <string name="wifi_generic_connection_error">"Παρουσιάστηκε ένα πρόβλημα κατά τη σύνδεση στο δίκτυο. Προσπαθήστε ξανά."</string>
+    <string name="wifi_menu_advanced">"Σύνθετα"</string>
+    <string name="wifi_ip_settings_titlebar">"Ρυθμίσεις IP"</string>
+    <string name="wifi_ip_settings_menu_save">"Αποθήκευση"</string>
+    <string name="wifi_ip_settings_menu_cancel">"Ακύρωση"</string>
+    <string name="wifi_ip_settings_invalid_ip">"Πληκτρολογήστε μια έγκυρη διεύθυνση IP."</string>
+    <string name="wifi_use_static_ip">"Χρήση στατικής διεύθυνσης IP"</string>
+    <string name="wifi_ip_address">"Διεύθυνση IP"</string>
+    <string name="wifi_dns1">"DNS 1"</string>
+    <string name="wifi_dns2">"DNS 2"</string>
+    <string name="wifi_gateway">"Πύλη"</string>
+    <string name="wifi_netmask">"Μάσκα δικτύου"</string>
+    <string name="wifi_context_menu_connect">"Σύνδεση στο δίκτυο"</string>
+    <string name="wifi_context_menu_forget">"Διαγραφή δικτύου από τη μνήμη"</string>
+    <string name="wifi_context_menu_change_password">"Αλλαγή κωδικού πρόσβασης"</string>
+    <string name="wifi_advanced_titlebar">"Σύνθετα"</string>
+    <string name="wifi_setting_num_channels_title">"Κανονιστικός τομέας"</string>
+    <string name="wifi_setting_num_channels_summary">"Ορισμός του αριθμού καναλιών για χρήση"</string>
+    <string name="wifi_setting_num_channels_error">"Παρουσιάστηκε ένα πρόβλημα κατά τη ρύθμιση του κανονιστικού τομέα."</string>
+    <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> κανάλια"</string>
+    <string name="wifi_setting_sleep_policy_title">"Πολιτική κατάστασης αδράνειας Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_summary">"Ορισμός εναλλαγής από δεδομένα Wi-Fi σε δεδομένα κινητού"</string>
+    <string name="wifi_setting_sleep_policy_error">"Παρουσιάστηκε ένα πρόβλημα κατά τη ρύθμιση της πολιτικής κατάστασης αδράνειας."</string>
+    <string name="wifi_advanced_mac_address_title">"Διεύθυνση MAC"</string>
+    <string name="fragment_status_scanning">"Σάρωση..."</string>
+    <string name="fragment_status_connecting">"Σύνδεση σε <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
+    <string name="fragment_status_authenticating">"Έλεγχος ταυτότητας με <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_obtaining_ip">"Λήψη διεύθυνσης IP από <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
+    <string name="fragment_status_connected">"Συνδεδεμένο σε <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="fragment_status_disconnecting">"Αποσύνδεση από <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
+    <string name="fragment_status_disconnected">"Αποσυνδέθηκε"</string>
+    <string name="fragment_status_failed">"Ανεπιτυχής"</string>
+    <string name="status_scanning">"Ανίχνευση..."</string>
+    <string name="status_connecting">"Σύνδεση..."</string>
+    <string name="status_authenticating">"Έλεγχος ταυτότητας..."</string>
+    <string name="status_obtaining_ip">"Λήψη διεύθυνσης..."</string>
+    <string name="status_connected">"Συνδεδεμένο"</string>
+    <string name="status_disconnecting">"Αποσύνδεση..."</string>
+    <string name="status_disconnected">"Αποσυνδέθηκε"</string>
+    <string name="status_failed">"Ανεπιτυχής"</string>
+    <string name="sound_and_display_settings">"Ήχος και εικόνα"</string>
+    <string name="sound_settings">"Ρυθμίσεις ήχου"</string>
+    <string name="sound_and_display_settings_summary">"Ρύθμιση ήχων κλήσης, ειδοποιήσεων, φωτεινότητας οθόνης"</string>
+    <string name="silent_mode_title">"Λειτουργία σίγασης"</string>
+    <string name="silent_mode_summary">"Όλοι οι ήχοι εκτός των πολυμέσων &amp; ξυπνητηριών έχουν σιγασθεί"</string>
+    <string name="silent_mode_incl_alarm_summary">"Όλοι οι ήχοι εκτός από τους ήχους πολυμέσων έχουν σιγασθεί"</string>
+    <string name="ringtone_title">"Ήχος κλήσης τηλεφώνου"</string>
+    <string name="ringtone_summary">"Ορισμός του προεπιλεγμένου ήχου κλήσης εισερχόμενης κλήσης"</string>
+    <string name="ring_volume_title">"Ένταση ειδοποίησης ήχου"</string>
+    <string name="ring_volume_summary">"Ορισμός έντασης ήχου για εισερχόμενες κλήσεις και ειδοποιήσεις"</string>
+    <string name="vibrate_title">"Δόνηση τηλεφώνου"</string>
+    <string name="vibrate_summary">"Δόνηση τηλεφώνου για εισερχόμενες κλήσεις"</string>
+    <string name="notification_sound_title">"Ήχος κλήσης ειδοποίησης"</string>
+    <string name="notification_sound_summary">"Ορισμός του προεπιλεγμένου ήχου κλήσης ειδοποίησης"</string>
+    <string name="incoming_call_volume_title">"Ένταση ήχου εισερχόμενης κλήσης"</string>
+    <string name="notification_volume_title">"Ένταση ήχου ειδοποίησης"</string>
+    <string name="checkbox_notification_same_as_incoming_call">"Χρήση έντασης ήχου εισερχόμενης κλήσης για ειδοποιήσεις"</string>
+    <string name="notification_sound_dialog_title">"Επιλογή ήχου κλήσης ειδοποίησης"</string>
+    <string name="media_volume_title">"Ένταση ήχου πολυμέσων"</string>
+    <string name="media_volume_summary">"Ορισμός έντασης ήχου για μουσική και βίντεο"</string>
+    <string name="dtmf_tone_enable_title">"Ήχοι ηχητικής αφής"</string>
+    <string name="dtmf_tone_enable_summary_on">"Αναπαραγωγή ήχων κατά τη χρήση του πληκτρολογίου κλήσης"</string>
+    <string name="dtmf_tone_enable_summary_off">"Αναπαραγωγή ήχων κατά τη χρήση του πληκτρολογίου κλήσης"</string>
+    <string name="sound_effects_enable_title">"Ηχητική επιλογή"</string>
+    <string name="sound_effects_enable_summary_on">"Αναπαραγωγή ήχου κατά την πραγματοποίηση επιλογής στην οθόνη"</string>
+    <string name="sound_effects_enable_summary_off">"Αναπαραγωγή ήχου κατά την πραγματοποίηση επιλογής στην οθόνη"</string>
+    <string name="play_media_notification_sounds_enable_title">"Ειδοποιήσεις κάρτας SD"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
+    <skip />
+    <string name="sync_settings">"Συγχρονισμός δεδομένων"</string>
+    <string name="sync_settings_summary">"Επιλογή εφαρμογών που θέλετε να συγχρονιστούν"</string>
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
+    <string name="display_settings">"Ρυθμίσεις προβολής"</string>
+    <string name="animations_title">"Κίνηση"</string>
+    <string name="animations_summary_on">"Προβολή κινούμενης εικόνας κατά το άνοιγμα &amp; κλείσιμο παραθύρων"</string>
+    <string name="animations_summary_off">"Προβολή κινούμενης εικόνας κατά το άνοιγμα &amp; κλείσιμο παραθύρων"</string>
+    <string name="accelerometer_title">"Προσανατολισμός"</string>
+    <string name="accelerometer_summary_on">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του τηλεφώνου"</string>
+    <string name="accelerometer_summary_off">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του τηλεφώνου"</string>
+    <string name="brightness">"Φωτεινότητα"</string>
+    <string name="brightness_summary">"Ρύθμιση της φωτεινότητας της οθόνης"</string>
+    <string name="screen_timeout">"Λήξη ορίου χρόνου οθόνης"</string>
+    <string name="screen_timeout_summary">"Προσαρμόστε τον χρόνο που πρέπει να παρέλθει πριν από την αυτόματη απενεργοποίηση της οθόνης."</string>
+    <string name="sim_lock_settings">"Ρυθμίσεις κλειδώματος κάρτας SIM"</string>
+    <string name="sim_lock_settings_category">"Ορισμός κλειδώματος κάρτας SIM"</string>
+    <string name="sim_lock_settings_title">"Κλείδωμα κάρτας SIM"</string>
+    <string name="sim_pin_toggle">"Κλείδωμα κάρτας SIM"</string>
+    <string name="sim_lock_on">"Απαιτείται αριθμός PIN για τη χρήση του τηλεφώνου"</string>
+    <string name="sim_lock_off">"Απαιτείται αριθμός PIN για τη χρήση του τηλεφώνου"</string>
+    <string name="sim_pin_change">"Αλλαγή αριθμού PIN κάρτας SIM"</string>
+    <string name="sim_enter_pin">"Αριθμός PIN κάρτας SIM"</string>
+    <string name="sim_enable_sim_lock">"Κλείδωμα κάρτας SIM"</string>
+    <string name="sim_disable_sim_lock">"Ξεκλείδωμα κάρτας SIM"</string>
+    <string name="sim_enter_old">"Παλιός αριθμός PIN κάρτας SIM"</string>
+    <string name="sim_enter_new">"Νέος αριθμός PIN κάρτας SIM"</string>
+    <string name="sim_reenter_new">"Πληκτρολογήστε ξανά τον νέο αριθμό PIN"</string>
+    <string name="sim_change_pin">"Αριθμός PIN κάρτας SIM"</string>
+    <string name="sim_bad_pin">"Εσφαλμένος αριθμός PIN!"</string>
+    <string name="sim_pins_dont_match">"Οι αριθμοί PIN δεν ταιριάζουν!"</string>
+    <string name="sim_change_failed">"Δεν είναι δυνατή η αλλαγή του αριθμού PIN."\n"Πιθανόν ο αριθμός PIN να είναι εσφαλμένος."</string>
+    <string name="sim_change_succeeded">"Ο αριθμός PIN της κάρτας SIM άλλαξε επιτυχώς"</string>
+    <string name="sim_lock_failed">"Δεν ήταν δυνατή η αλλαγή της κατάστασης κλειδώματος της κάρτας SIM."\n"Πιθανόν ο αριθμός PIN να είναι εσφαλμένος."</string>
+    <string name="sim_enter_ok">"OK"</string>
+    <string name="sim_enter_cancel">"Ακύρωση"</string>
+    <string name="device_info_settings">"Κατάσταση τηλεφώνου"</string>
+    <string name="system_update_settings_list_item_title">"Ενημερώσεις συστήματος"</string>
+    <string name="system_update_settings_list_item_summary">"Έλεγχος για ενημερώσεις συστήματος"</string>
+    <string name="firmware_version">"Έκδοση firmware"</string>
+    <string name="model_number">"Αριθμός μοντέλου"</string>
+    <string name="baseband_version">"Έκδοση βασικού φάσματος"</string>
+    <string name="kernel_version">"Έκδοση Kernel"</string>
+    <string name="build_number">"Αριθμός έκδοσης"</string>
+    <string name="device_info_not_available">"Δεν είναι διαθέσιμο"</string>
+    <string name="device_status_activity_title">"Κατάσταση"</string>
+    <string name="device_status">"Κατάσταση"</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
+    <string name="storage_settings_title">"Κάρτα SD &amp; αποθηκευτικός χώρος τηλεφώνου"</string>
+    <string name="storage_settings_summary">"Αποπροσάρτηση κάρτας SD, προβολή διαθέσιμου αποθηκευτικού χώρου"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
+    <string name="status_network_type">"Τύπος δικτύου κινητής τηλεφωνίας"</string>
+    <string name="status_data_state">"Κατάσταση δικτύου κινητής τηλεφωνίας"</string>
+    <string name="status_service_state">"Κατάσταση υπηρεσίας"</string>
+    <string name="status_signal_strength">"Ισχύς σήματος"</string>
+    <string name="status_roaming">"Περιαγωγή"</string>
+    <string name="status_operator">"Δίκτυο"</string>
+    <string name="status_wifi_mac_address">"Διεύθυνση MAC Wi-Fi"</string>
+    <string name="status_bt_address">"Διεύθυνση Bluetooth"</string>
+    <string name="status_unavailable">"Μη διαθέσιμο"</string>
+    <string name="status_up_time">"Χρόνος από την τελευταία εκκίνηση"</string>
+    <string name="status_awake_time">"Χρόνος αφύπνισης"</string>
+    <string name="internal_memory">"Εσωτερικός αποθηκευτικός χώρος τηλεφώνου"</string>
+    <string name="sd_memory">"Κάρτα SD"</string>
+    <string name="memory_available">"Διαθέσιμος χώρος"</string>
+    <string name="memory_size">"Συνολικός χώρος"</string>
+    <string name="sd_eject">"Αποπροσάρτηση κάρτας SD"</string>
+    <string name="sd_eject_summary">"Αποπροσαρτήστε την κάρτα SD για ασφαλή αφαίρεση"</string>
+    <string name="sd_format">"Διαμόρφωση κάρτας SD"</string>
+    <string name="sd_format_summary">"Διαμόρφωση (διαγραφή) της κάρτας SD"</string>
+    <string name="sd_unavailable">"Μη διαθέσιμο"</string>
+    <string name="read_only">" (Μόνο για ανάγνωση)"</string>
+    <string name="battery_status_title">"Κατάσταση μπαταρίας"</string>
+    <string name="battery_level_title">"Επίπεδο μπαταρίας"</string>
+    <string name="apn_settings">"APN"</string>
+    <string name="apn_edit">"Επεξεργασία σημείου πρόσβασης"</string>
+    <string name="apn_not_set">"&lt;Δεν έχει οριστεί&gt;"</string>
+    <string name="apn_name">"Όνομα"</string>
+    <string name="apn_apn">"APN"</string>
+    <string name="apn_http_proxy">"Διακομιστής μεσολάβησης"</string>
+    <string name="apn_http_port">"Θύρα"</string>
+    <string name="apn_user">"Όνομα χρήστη"</string>
+    <string name="apn_password">"Κωδικός πρόσβασης"</string>
+    <string name="apn_server">"Διακομιστής"</string>
+    <string name="apn_mmsc">"MMSC"</string>
+    <string name="apn_mms_proxy">"διακομιστής μεσολάβησης MMS"</string>
+    <string name="apn_mms_port">"Θύρα MMS"</string>
+    <string name="apn_mcc">"MCC"</string>
+    <string name="apn_mnc">"MNC"</string>
+    <string name="apn_type">"Τύπος APN"</string>
+    <string name="menu_delete">"Διαγραφή APN"</string>
+    <string name="menu_new">"Νέο APN"</string>
+    <string name="menu_save">"Αποθήκευση"</string>
+    <string name="menu_cancel">"Απόρριψη"</string>
+    <string name="error_title">"Προσοχή"</string>
+    <string name="error_name_empty">"Το πεδίο Όνομα δεν μπορεί να είναι κενό."</string>
+    <string name="error_apn_empty">"Το APN δεν μπορεί να είναι κενό."</string>
+    <string name="error_mcc_not3">"Το πεδίο MCC πρέπει να αποτελείται από 3 ψηφία."</string>
+    <string name="error_mnc_not23">"Το πεδίο MNC πρέπει να αποτελείται από 2 ή 3 ψηφία."</string>
+    <string name="restore_default_apn">"Επαναφορά προεπιλεγμένων ρυθμίσεων APN"</string>
+    <string name="menu_restore">"Επαναφορά στις προεπιλογές"</string>
+    <string name="restore_default_apn_completed">"Η επαναφορά των εργοστασιακών ρυθμίσεων APN ολοκληρώθηκε"</string>
+    <string name="master_clear_title">"Επαναφορά εργοστασιακών δεδομένων"</string>
+    <string name="master_clear_summary">"Διαγραφή όλων των δεδομένων στο τηλέφωνο"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
+    <string name="master_clear_button_text">"Επαναφορά τηλεφώνου"</string>
+    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
+    <skip />
+    <string name="master_clear_final_button_text">"Διαγραφή όλων"</string>
+    <string name="master_clear_gesture_prompt">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
+    <string name="master_clear_gesture_explanation">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για επιβεβαίωση επαναφοράς τηλεφώνου."</string>
+    <string name="master_clear_failed">"Δεν πραγματοποιήθηκε επαναφορά επειδή η υπηρεσία Εκκαθάρισης συστήματος δεν είναι διαθέσιμη."</string>
+    <string name="media_format_title">"Διαμόρφωση κάρτας SD."</string>
+    <string name="media_format_summary">"Διαγραφή όλων των δεδομένων στην κάρτα SD"</string>
+    <string name="media_format_desc">"Αυτή η ενέργεια θα διαγράψει την κάρτα SD στο τηλέφωνο. Θα χάσετε όλα τα δεδομένα στην κάρτα!"</string>
+    <string name="media_format_button_text">"Διαμόρφωση κάρτας SD"</string>
+    <string name="media_format_final_desc">"Να γίνει διαμόρφωση της κάρτας SD, η οποία θα διαγράψει όλα τα πολυμέσα σας; Η ενέργεια είναι μη αναστρέψιμη!"</string>
+    <string name="media_format_final_button_text">"Διαγραφή όλων"</string>
+    <string name="media_format_gesture_prompt">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
+    <string name="media_format_gesture_explanation">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για επιβεβαίωση διαμόρφωσης μιας κάρτας SD."</string>
+    <string name="call_settings_title">"Ρυθμίσεις κλήσης"</string>
+    <string name="call_settings_summary">"Ορισμός αυτόματου τηλεφωνητή, προώθησης κλήσης, αναμονής κλήσης, αναγνώρισης κλήσης"</string>
+    <string name="network_settings_title">"Δίκτυα κινητής τηλεφωνίας"</string>
+    <string name="network_settings_summary">"Ορισμός επιλογών για περιαγωγή, δίκτυα, APN"</string>
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
+    <string name="location_network_based">"Χρήση ασύρματων δικτύων"</string>
+    <string name="location_networks_disabled">"Προβολή τοποθεσίας σε εφαρμογές (όπως π.χ. στους Χάρτες) με τη χρήση ασύρματων δικτύων"</string>
+    <string name="location_neighborhood_level">"Η τοποθεσία προσδιορίζεται από δίκτυα Wi-Fi και/ή δίκτυα κινητής τηλεφωνίας"</string>
+    <string name="location_gps">"Ενεργοποίηση δορυφόρων GPS"</string>
+    <string name="location_street_level">"Κατά την εύρεση τοποθεσίας, η ακρίβεια είναι σε επίπεδο δρόμου (αποεπιλέξτε το για εξοικονόμηση μπαταρίας)"</string>
+    <string name="location_gps_disabled">"Εντοπισμός σε επίπεδο δρόμου (απαιτεί μεγαλύτερη κατανάλωση μπαταρίας και μετάβαση σε ανοικτό χώρο)"</string>
+    <!-- no translation found for use_location_title (7585990952633568732) -->
+    <skip />
+    <!-- no translation found for use_location_summary (4411467143899877395) -->
+    <skip />
+    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
+    <skip />
+    <string name="agree">"Συμφωνώ"</string>
+    <string name="disagree">"Διαφωνώ"</string>
+    <string name="about_settings">"Σχετικά με το τηλέφωνο"</string>
+    <string name="about_settings_summary">"Προβολή νομικών πληροφοριών, κατάστασης τηλεφώνου, έκδοσης λογισμικού"</string>
+    <string name="legal_information">"Νομικές πληροφορίες"</string>
+    <string name="contributors_title">"Συνεργάτες"</string>
+    <string name="copyright_title">"Πνευματικά δικαιώματα"</string>
+    <string name="license_title">"Άδεια"</string>
+    <string name="terms_title">"Όροι και προϋποθέσεις"</string>
+    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
+    <skip />
+    <string name="system_tutorial_list_item_summary">"Μάθετε πώς να χρησιμοποιείτε το τηλέφωνό σας"</string>
+    <string name="settings_license_activity_title">"Άδειες λογισμικού ανοικτού κώδικα"</string>
+    <string name="settings_license_activity_unavailable">"Παρουσιάστηκε ένα πρόβλημα κατά τη φόρτωση των αδειών."</string>
+    <string name="settings_license_activity_loading">"Φόρτωση..."</string>
+    <string name="lock_settings_title">"Μοτίβο ξεκλειδώματος οθόνης"</string>
+    <string name="lockpattern_change_lock_pattern_label">"Αλλαγή μοτίβου ξεκλειδώματος"</string>
+    <string name="lockpattern_need_to_unlock">"Επιβεβαίωση αποθηκευμένου μοτίβου"</string>
+    <string name="lockpattern_need_to_unlock_wrong">"Προσπαθήστε ξανά:"</string>
+    <string name="lockpattern_recording_intro_header">"Σχεδίαση μοτίβου ξεκλειδώματος"</string>
+    <string name="lockpattern_recording_intro_footer">"Πατήστε \"Μενού\" για βοήθεια."</string>
+    <string name="lockpattern_recording_inprogress">"Αφήστε το δάκτυλο μετά την ολοκλήρωση."</string>
+    <string name="lockpattern_recording_incorrect_too_short">"Συνδέστε τουλάχιστον <xliff:g id="NUMBER">%d</xliff:g> σημεία. Προσπαθήστε ξανά:"</string>
+    <string name="lockpattern_pattern_entered_header">"Το μοτίβο καταγράφηκε!"</string>
+    <string name="lockpattern_need_to_confirm">"Σχεδιάστε ξανά το μοτίβο για επιβεβαίωση:"</string>
+    <string name="lockpattern_pattern_confirmed_header">"Το νέο μοτίβο ξεκλειδώματος:"</string>
+    <string name="lockpattern_confirm_button_text">"Επιβεβαίωση"</string>
+    <string name="lockpattern_restart_button_text">"Ανασχεδιασμός"</string>
+    <string name="lockpattern_retry_button_text">"Προσπάθεια ξανά"</string>
+    <string name="lockpattern_continue_button_text">"Συνέχεια"</string>
+    <string name="lockpattern_settings_title">"Μοτίβο ξεκλειδώματος"</string>
+    <string name="lockpattern_settings_enable_title">"Απαιτείται μοτίβο"</string>
+    <string name="lockpattern_settings_enable_summary">"Πρέπει να σχεδιάσετε το μοτίβο για το ξεκλείδωμα της οθόνης"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">"Χρήση εμφανούς μοτίβου"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"Χρήση απτών σχολίων"</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"Ορισμός μοτίβου ξεκλειδώματος"</string>
+    <string name="lockpattern_settings_change_lock_pattern">"Αλλαγή μοτίβου ξεκλειδώματος"</string>
+    <string name="lockpattern_settings_help_how_to_record">"Πώς να σχεδιάσετε ένα μοτίβο ξεκλειδώματος"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Πάρα πολλές ανεπιτυχείς προσπάθειες!"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Προσπαθήστε ξανά σε <xliff:g id="NUMBER">%d</xliff:g> δευτερόλεπτα."</string>
+    <string name="skip_button_label">"Ακύρωση"</string>
+    <string name="next_button_label">"Επόμενο"</string>
+    <string name="lock_title">"Ασφάλιση του τηλεφώνου σας"</string>
+    <string name="lock_intro_message"><font size="17">"Προστατέψτε το τηλέφωνό σας από μη εξουσιοδοτημένη χρήση δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. "\n<font height="17">\n</font><b>"1"</b>"  Στην επόμενη οθόνη παρακολουθήστε ένα παράδειγμα σχεδίασης μοτίβου. "\n<font height="17">\n</font><b>"2"</b>"  Όταν είστε έτοιμοι, σχεδιάστε το προσωπικό σας μοτίβο ξεκλειδώματος. Πειραματιστείτε με διάφορα μοτίβα αλλά συνδέστε τουλάχιστον τέσσερα σημεία. "\n<font height="17">\n</font><b>"3"</b>"  Ξανασχεδιάστε το μοτίβο σας για επιβεβαίωση. "\n<font height="17">\n</font><b>"Είστε έτοιμοι να ξεκινήσετε; Πατήστε \"Επόμενο\""</b>". "\n<font height="3">\n</font>"Εάν δεν θέλετε να προστατεύσετε το τηλέφωνό σας, επιλέξτε “Ακύρωση”."</font></string>
+    <string name="lock_example_title">"Παράδειγμα μοτίβου"</string>
+    <string name="lock_example_message">"Συνδέστε τουλάχιστον τέσσερις τελείες."\n" "\n"Επιλέξτε \"Επόμενο\" όταν είστε έτοιμοι να σχεδιάσετε το δικό σας μοτίβο."</string>
+    <string name="manageapplications_settings_title">"Διαχείριση εφαρμογών"</string>
+    <string name="manageapplications_settings_summary">"Διαχείριση και κατάργηση εγκατεστημένων εφαρμογών"</string>
+    <string name="applications_settings">"Εφαρμογές"</string>
+    <string name="applications_settings_summary">"Διαχείριση εφαρμογών, ορισμός συντομεύσεων γρήγορης εκκίνησης"</string>
+    <string name="applications_settings_header">"Ρυθμίσεις εφαρμογών"</string>
+    <string name="install_applications">"Άγνωστες πηγές"</string>
+    <string name="install_unknown_applications">"Επιτρέπει την εγκατάσταση εφαρμογών που δεν βρίσκονται στο Android Market"</string>
+    <string name="install_all_warning">"Το τηλέφωνό σας και τα προσωπικά δεδομένα σας είναι ευάλωτα σε επιθέσεις από εφαρμογές που προέρχονται από άγνωστες πηγές. Συμφωνείτε ότι είστε οι μοναδικοί υπεύθυνοι για κάθε ζημιά στο τηλέφωνο ή για απώλεια δεδομένων που ενδέχεται να προκύψουν από τη χρήση τέτοιων εφαρμογών."</string>
+    <string name="application_info_label">"Πληροφορίες εφαρμογής"</string>
+    <string name="storage_label">"Αποθηκευτικός χώρος"</string>
+    <string name="auto_launch_label">"Εκκίνηση από προεπιλογή"</string>
+    <string name="permissions_label">"Άδειες"</string>
+    <string name="cache_header_label">"Προσωρινή μνήμη"</string>
+    <string name="clear_cache_btn_text">"Εκκαθάριση προσωρινής μνήμης"</string>
+    <string name="cache_size_label">"Προσωρινή μνήμη"</string>
+    <string name="controls_label">"Στοιχεία ελέγχου"</string>
+    <string name="force_stop">"Αναγκαστική διακοπή"</string>
+    <string name="total_size_label">"Σύνολο"</string>
+    <string name="application_size_label">"Εφαρμογή"</string>
+    <string name="data_size_label">"Δεδομένα"</string>
+    <string name="uninstall_text">"Κατάργηση εγκατάστασης"</string>
+    <string name="clear_user_data_text">"Εκκαθάριση δεδομένων"</string>
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
+    <string name="auto_launch_enable_text">"Επιλέξατε την εκτέλεση αυτής της εφαρμογής από προεπιλογή για ορισμένες ενέργειες."</string>
+    <string name="auto_launch_disable_text">"Δεν έχουν οριστεί προεπιλογές."</string>
+    <string name="clear_activities">"Εκκαθάριση προεπιλογών"</string>
+    <string name="unknown">"Άγνωστο"</string>
+    <string name="sort_order_alpha">"Ταξινόμηση"</string>
+    <string name="sort_order_size">"Ταξινόμηση με βάση μέγεθος"</string>
+    <string name="manage_space_text">"Διαχείριση χώρου"</string>
+    <string name="filter">"Φίλτρο"</string>
+    <string name="filter_dlg_title">"Επιλογές φίλτρου"</string>
+    <string name="filter_apps_all">"Όλα"</string>
+    <string name="filter_apps_third_party">"Τρίτο μέρος"</string>
+    <string name="filter_apps_running">"Εκτελείται"</string>
+    <string name="loading">"Φόρτωση..."</string>
+    <string name="recompute_size">"Εκ νέου υπολογισμός μεγέθους..."</string>
+    <string name="clear_data_dlg_title">"Διαγραφή"</string>
+    <string name="clear_data_dlg_text">"Όλες οι πληροφορίες που αποθηκεύσατε σε αυτήν την εφαρμογή θα διαγραφούν οριστικά."</string>
+    <string name="dlg_ok">"OK"</string>
+    <string name="dlg_cancel">"Ακύρωση"</string>
+    <string name="app_not_found_dlg_title">"Η εφαρμογή δεν βρέθηκε"</string>
+    <string name="app_not_found_dlg_text">"Η εφαρμογή δεν βρέθηκε στη λίστα των εγκατεστημένων εφαρμογών."</string>
+    <string name="clear_data_failed">"Δεν είναι δυνατή η εκκαθάριση δεδομένων εφαρμογής."</string>
+    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
+    <skip />
+    <string name="security_settings_desc">"Αυτή η εφαρμογή μπορεί να αποκτήσει πρόσβαση στα ακόλουθα στο τηλέφωνό σας:"</string>
+    <string name="computing_size">"Υπολογισμός..."</string>
+    <string name="invalid_size_value">"Δεν είναι δυνατός ο υπολογισμός του μεγέθους του πακέτου"</string>
+    <string name="empty_list_msg">"Δεν έχετε εγκαταστήσει εφαρμογές τρίτων μερών."</string>
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
+    <string name="language_settings">"Τοπικές ρυθμίσεις &amp; κείμενο"</string>
+    <string name="language_settings_summary">"Ορισμός τοπικών ρυθμίσεων (γλώσσα και περιοχή), είσοδος κειμένου και επιλογές αυτόματης διόρθωσης"</string>
+    <string name="language_category">"Τοπικές ρυθμίσεις"</string>
+    <string name="text_category">"Ρυθμίσεις κειμένου"</string>
+    <string name="phone_language">"Επιλογή τοπικών ρυθμίσεων"</string>
+    <string name="phone_language_summary">"Επιλογή γλώσσας και περιοχής"</string>
+    <string name="auto_replace">"Αυτόματη αντικατάσταση"</string>
+    <string name="auto_replace_summary">"Διόρθωση εσφαλμένα πληκτρολογημένων λέξεων"</string>
+    <string name="auto_caps">"Αυτόματη χρήση κεφαλαίων"</string>
+    <string name="auto_caps_summary">"Μετατροπή του πρώτου γράμματος σε προτάσεις σε κεφαλαίο"</string>
+    <string name="auto_punctuate">"Αυτόματη στίξη"</string>
+    <string name="hardkeyboard_category">"Κανονικές ρυθμίσεις πληκτρολογίου"</string>
+    <string name="auto_punctuate_summary">"Πατήστε το πλήκτρο Space δύο φορές για να εισαγάγετε \".\""</string>
+    <string name="show_password">"Εμφανιζόμενοι κωδικοί πρόσβασης"</string>
+    <string name="show_password_summary">"Εμφάνιση κωδικού πρόσβασης κατά την πληκτρολόγηση"</string>
+    <string name="ime_security_warning">"Η μέθοδος εισόδου ενδέχεται να έχει τη δυνατότητα συλλογής όλων των κειμένων που πληκτρολογείτε, συμπεριλαμβανομένων προσωπικών δεδομένων όπως κωδικοί πρόσβασης και αριθμοί πιστωτικής κάρτας. Προέρχεται από την εφαρμογή <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Ενεργοποίηση αυτής της μεθόδου εισόδου;"</string>
+    <string name="user_dict_settings_titlebar">"Λεξικό χρήστη"</string>
+    <string name="user_dict_settings_title">"Λεξικό χρήστη"</string>
+    <string name="user_dict_settings_summary">"Προσθήκη &amp; κατάργηση λέξεων από το λεξικό χρήστη"</string>
+    <string name="user_dict_settings_add_menu_title">"Προσθήκη"</string>
+    <string name="user_dict_settings_add_dialog_title">"Προσθήκη στο λεξικό"</string>
+    <string name="user_dict_settings_edit_dialog_title">"Επεξεργασία λέξης"</string>
+    <string name="user_dict_settings_context_menu_edit_title">"Επεξεργασία"</string>
+    <string name="user_dict_settings_context_menu_delete_title">"Διαγραφή"</string>
+    <string name="user_dict_settings_empty_text">"Δεν υπάρχουν λέξεις καταχωρημένες στο λεξικό χρήστη. Μπορείτε να προσθέσετε μια λέξη μέσω του μενού."</string>
+    <string name="testing">"Δοκιμή"</string>
+    <string name="testing_phone_info">"Πληροφορίες τηλεφώνου"</string>
+    <string name="testing_battery_info">"Πληροφορίες μπαταρίας"</string>
+    <string name="testing_battery_history">"Ιστορικό μπαταρίας"</string>
+    <string name="quick_launch_title">"Γρήγορη εκκίνηση"</string>
+    <string name="quick_launch_summary">"Ορισμός συντομεύσεων πληκτρολογίου για την εκκίνηση εφαρμογών"</string>
+    <string name="quick_launch_assign_application">"Ορισμός εφαρμογής"</string>
+    <string name="quick_launch_no_shortcut">"Δεν υπάρχει συντόμευση"</string>
+    <string name="quick_launch_shortcut">"Αναζήτηση + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
+    <string name="quick_launch_clear_dialog_title">"Εκκαθάριση"</string>
+    <string name="quick_launch_clear_dialog_message">"Η συντόμευσή σας για <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) θα εκκαθαριστεί."</string>
+    <string name="quick_launch_clear_ok_button">"OK"</string>
+    <string name="quick_launch_clear_cancel_button">"Ακύρωση"</string>
+    <string name="quick_launch_display_mode_applications">"Εφαρμογές"</string>
+    <string name="quick_launch_display_mode_shortcuts">"Συντομεύσεις"</string>
+    <string name="input_methods_settings_title">"Είσοδος κειμένου"</string>
+    <string name="input_methods_settings_summary">"Διαχείριση επιλογών εισόδου κειμένου"</string>
+    <string name="input_methods_settings_label_format">"<xliff:g id="IME_NAME">%1$s</xliff:g> ρυθμίσεις"</string>
+    <string name="onscreen_keyboard_settings_summary">"Ρυθμίσεις πληκτρολογίου οθόνης"</string>
+    <string name="builtin_keyboard_settings_title">"Πληκτρολόγιο συσκευής"</string>
+    <string name="builtin_keyboard_settings_summary">"Ενσωματωμένες ρυθμίσεις πληκτρολογίου"</string>
+    <string name="development_settings_title">"Ανάπτυξη"</string>
+    <string name="development_settings_summary">"Ορισμός επιλογών για ανάπτυξη εφαρμογής"</string>
+    <string name="enable_adb">"Εντοπισμός σφαλμάτων USB"</string>
+    <string name="enable_adb_summary">"Λειτουργία εντοπισμού σφαλμάτων όταν το USB είναι συνδεδεμένο"</string>
+    <string name="keep_screen_on">"Παραμονή σε κανονική κατάσταση λειτουργίας"</string>
+    <string name="keep_screen_on_summary">"Η οθόνη δεν θα μεταβαίνει ποτέ σε κατάσταση αδράνειας κατά τη φόρτιση"</string>
+    <string name="allow_mock_location">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
+    <string name="allow_mock_location_summary">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
+    <!-- no translation found for adb_warning_title (1756027479229533250) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (5352555112049663033) -->
+    <skip />
+    <string name="gadget_picker_title">"Επιλογή gadget"</string>
+    <string name="widget_picker_title">"Επιλογή γραφικού στοιχείου"</string>
+    <string name="battery_history_details_for">"Λεπτομέρειες για UID %d"</string>
+    <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
+    <string name="battery_history_network_usage">"Λεπτομέρειες χρήσης δικτύου για <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
+    <string name="battery_history_bytes_received">"Αριθμός byte που ελήφθησαν: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_sent">"Αριθμός byte που απεστάλησαν: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_total">"Συνολικό μέγεθος σε bytes: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_cpu_usage">"Λεπτομέρειες χρήσης CPU για <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
+    <string name="battery_history_user_time">"Χρόνος χρήστη:"</string>
+    <string name="battery_history_system_time">"Ώρα συστήματος:"</string>
+    <string name="battery_history_total_time">"Συνολικός χρόνος:"</string>
+    <string name="battery_history_starts">"Ξεκινά: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
+    <string name="battery_history_packages_sharing_this_uid">"Πακέτα που μοιράζονται αυτό το UID:"</string>
+    <string name="battery_history_no_data">"Δεν υπάρχουν διαθέσιμα δεδομένα χρήσης μπαταρίας"</string>
+    <string name="battery_history_sensor">"Αισθητήρας:"</string>
+    <string name="battery_history_wakelock">"Μερικό κλείδωμα αφύπνισης"</string>
+    <string name="battery_history_used_by_packages">"Αισθητήρας που χρησιμοποιείται από πακέτα:"</string>
+    <string name="battery_history_sensor_usage">"Χρησιμοποιήθηκε <xliff:g id="COUNT">%1$d</xliff:g> φορές από <xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
+    <string name="battery_history_sensor_usage_multi">"Χρησιμοποιήθηκε <xliff:g id="COUNT">%1$d</xliff:g> φορές από ένα εκ των:"</string>
+    <string name="battery_history_awake_label">"Εκτελείται"</string>
+    <string name="battery_history_screen_on_label">"Οθόνη ενεργοποιημένη"</string>
+    <string name="battery_history_phone_on_label">"Τηλέφωνο ενεργοποιημένο"</string>
+    <string name="battery_history_awake">"Χρόνος εκτός κατάστασης αδράνειας:"</string>
+    <string name="battery_history_screen_on">"Χρόνος που παρήλθε με ενεργοποιημένη οθόνη:"</string>
+    <string name="battery_history_phone_on">"Χρόνος που παρήλθε με ενεργοποιημένο τηλέφωνο:"</string>
+    <string name="battery_history_screen_on_battery">"Ενεργοποιημένη μπαταρία:"</string>
+    <string name="battery_history_screen_on_plugged">"Συνδεδεμένο σε:"</string>
+    <string name="usage_stats_label">"Στατιστικά χρήσης"</string>
+    <string name="testing_usage_stats">"Στατιστικά χρήσης"</string>
+    <string name="display_order_text">"Ταξινόμηση με βάση:"</string>
+    <string name="app_name_label">"Εφαρμογή"</string>
+    <string name="launch_count_label">"Μέτρηση"</string>
+    <string name="usage_time_label">"Χρόνος χρήσης"</string>
+    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
+    <skip />
+    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
+    <skip />
+    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
+    <skip />
+    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (4630925382578609056) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
+    <skip />
+    <!-- no translation found for usage_name_percent (1899151069711662289) -->
+    <skip />
+    <!-- no translation found for details_title (7564809986329021063) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (2353149143338929583) -->
+    <skip />
+    <!-- no translation found for power_wifi (2382791137776486974) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (7052979399415080971) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
+    <skip />
+    <!-- no translation found for battery_action_display (5302763261448580102) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3003604969548979254) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (1834412555123982714) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for tts_settings (6454363854545277027) -->
+    <skip />
+    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (5064947197040356736) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_demo (405357591189935876) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for gadget_title (7455548605888590466) -->
+    <skip />
+    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
+    <skip />
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
+    <skip />
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
+    <skip />
+    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
+    <skip />
+    <!-- no translation found for vpn_no_button (7620339571187119107) -->
+    <skip />
+    <!-- no translation found for vpn_back_button (192036339792734970) -->
+    <skip />
+    <!-- no translation found for vpn_mistake_button (1759404628590603933) -->
+    <skip />
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <!-- no translation found for vpn_connecting (8039521381692090116) -->
+    <skip />
+    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
+    <skip />
+    <!-- no translation found for vpn_connected (7641723116362845781) -->
+    <skip />
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
+</resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index b368143..c3c74cb 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -32,19 +32,30 @@
     <item>"10 minutos"</item>
     <item>"Nunca se debe agotar el tiempo de espera"</item>
   </string-array>
-  <string-array name="wifi_security_entries">
-    <item>"Automáticamente"</item>
-    <item>"Ninguno"</item>
-    <item>"WEP"</item>
-    <item>"WPA Personal"</item>
-    <item>"WPA2 Personal"</item>
-  </string-array>
-  <string-array name="wifi_security_without_auto_entries">
-    <item>"Ninguno"</item>
-    <item>"WEP"</item>
-    <item>"WPA Personal"</item>
-    <item>"WPA2 Personal"</item>
-  </string-array>
+    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
+    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
+    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
+    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
+    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
+    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
+    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
+    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
+    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
+    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
+    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
+    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
+    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
+    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
+    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
+    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
+    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
+    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
+    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
+    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
+    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
+    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
+    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
+    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item>"Automáticamente"</item>
     <item>"WEP ASCII"</item>
@@ -73,4 +84,15 @@
     <item>"Lanzar recuento"</item>
     <item>"Nombre de la aplicación"</item>
   </string-array>
+    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
+    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
+    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
+    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
+    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
+    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
+    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
+    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 9aa86af..029a308 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -105,9 +105,13 @@
     <string name="bluetooth_notif_title">"Vinculando solicitud"</string>
     <string name="bluetooth_notif_message">"Seleccionar para vincularse con "</string>
     <string name="date_and_time">"Configuración de fecha y hora"</string>
-    <string name="date_time_12_hour_sample">"1:00 p.m."</string>
+    <string name="date_time_12_hour_sample">"1:00 p. m."</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Cambiar hora"</string>
+    <string name="date_time_changeDate_text">"Fecha"</string>
     <string name="choose_timezone">"Seleccionar zona horaria"</string>
+    <!-- no translation found for normal_date_format (1982904221918374153) -->
+    <skip />
     <string name="display_preview_label">"Vista previa:"</string>
     <string name="display_font_size_label">"Tamaño de fuente:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -188,12 +192,15 @@
     <string name="proxy_settings_label">"Configuración de proxy"</string>
     <string name="cancel">"Cancelar"</string>
     <string name="settings_label">"Configuración"</string>
+    <!-- no translation found for settings_shortcut (3672145147925639262) -->
+    <skip />
     <string name="airplane_mode">"Modo avión"</string>
     <string name="airplane_mode_summary">"Desactivar todas las conexiones inalámbricas"</string>
     <string name="airplane_mode_turning_on">"Desactivando conexiones inalámbricas…"</string>
     <string name="airplane_mode_turning_off">"Activando conexiones inalámbricas…"</string>
     <string name="radio_controls_title">"Controles de teléfono inalámbrico"</string>
-    <string name="radio_controls_summary">"Administrar Wi-Fi, Bluetooth, modo avión y redes de celulares"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
     <!-- no translation found for roaming (3596055926335478572) -->
     <skip />
     <!-- no translation found for roaming_enable (3737380951525303961) -->
@@ -225,7 +232,8 @@
     <string name="zone_list_menu_sort_alphabetically">"Ordenar alfabéticamente"</string>
     <string name="zone_list_menu_sort_by_timezone">"Ordenar por zona horaria"</string>
     <string name="security_settings_title">"Seguridad y ubicación"</string>
-    <string name="security_settings_summary">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de tarjeta SIM"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"Contraseñas"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Activar Bluetooth"</string>
@@ -234,7 +242,7 @@
     <string name="bluetooth_settings_summary">"Administrar conexiones, establecer nombre y detección del dispositivo"</string>
     <string name="bluetooth_pin_entry">"Solicitud de vinculación de Bluetooth"</string>
     <string name="bluetooth_device_info">"Información del dispositivo Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Escribe el PIN para poder vincular."\n"(prueba con 0000 ó 1234.)"</string>
+    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Escribe el PIN para poder vincular."\n"(prueba con 0000 ó 1234)."</string>
     <string name="bluetooth_error_title">"Atención"</string>
     <string name="bluetooth_pairing_error_message">"Se ha producido un problema al vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message">"Se ha producido un problema al vincular <xliff:g id="DEVICE_NAME">%1$s</xliff:g> debido a que el PIN que has escrito es incorrecto."</string>
@@ -282,11 +290,23 @@
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
+    <skip />
+    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
+    <skip />
     <string name="wifi_security_unknown">"Desconocido"</string>
-    <string name="wifi_security_verbose_open">"Abrir red"</string>
-    <string name="wifi_security_verbose_wep">"Asegurado con WEP"</string>
-    <string name="wifi_security_verbose_wpa">"Asegurado con WPA"</string>
-    <string name="wifi_security_verbose_wpa2">"Asegurado con WPA2"</string>
+    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
+    <skip />
     <string name="ip_address">"Dirección IP"</string>
     <string name="signal">"Potencia de la señal"</string>
     <string name="wifi_starting">"Encendiendo..."</string>
@@ -299,12 +319,27 @@
     <string name="error_saving">"No se ha podido guardar la red"</string>
     <string name="connect">"Conectar"</string>
     <string name="connect_to_blank">"Conectar a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for please_select_eap (4488240331626456338) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for please_type_identity (7061261155499513089) -->
+    <skip />
+    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
+    <skip />
+    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
+    <skip />
+    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
+    <skip />
+    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
+    <skip />
     <string name="please_type_passphrase">"Contraseña de teléfono inalámbrico"</string>
     <string name="please_type_hex_key">"Clave hexadecimal WEP (0-9, A-F)"</string>
     <string name="wifi_show_password">"Mostrar contraseña."</string>
     <string name="scan_wifi">"Explorar"</string>
     <string name="summary_not_in_range">"Fuera del alcance"</string>
-    <string name="summary_remembered">"Recordado"</string>
+    <!-- no translation found for summary_remembered (6079941090549401742) -->
+    <skip />
     <string name="summary_connection_failed">"La conexión no se ha realizado correctamente, selecciona para volver a intentarlo"</string>
     <string name="wifi_access_points">"Redes de Wi-Fi"</string>
     <string name="wifi_type_ssid">"SSID de red"</string>
@@ -360,14 +395,13 @@
     <string name="sound_and_display_settings_summary">"Establecer tonos de llamada, notificaciones, brillo de pantalla"</string>
     <string name="silent_mode_title">"Modo silencioso"</string>
     <string name="silent_mode_summary">"Todos los sonidos excepto los medios y las alarmas están en silencio"</string>
-    <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
-    <skip />
+    <string name="silent_mode_incl_alarm_summary">"Todos los sonidos excepto los medios están en silencio"</string>
     <string name="ringtone_title">"Tono de llamada del teléfono"</string>
     <string name="ringtone_summary">"Establece tu tono predeterminado de llamada entrante"</string>
     <string name="ring_volume_title">"Volumen del timbre"</string>
     <string name="ring_volume_summary">"Establecer el volumen para las llamadas entrantes y notificaciones"</string>
     <string name="vibrate_title">"Vibración del teléfono"</string>
-    <string name="vibrate_summary">"Hacer vibrar al teléfono para las llamadas entrantes"</string>
+    <string name="vibrate_summary">"Hacer vibrar el teléfono para las llamadas entrantes"</string>
     <string name="notification_sound_title">"Tono de llamada de notificación"</string>
     <string name="notification_sound_summary">"Establecer tono predeterminado de llamada de notificación"</string>
     <string name="incoming_call_volume_title">"Volumen de llamada entrante"</string>
@@ -383,10 +417,16 @@
     <string name="sound_effects_enable_summary_on">"Reproducir el sonido al realizar la selección de pantalla"</string>
     <string name="sound_effects_enable_summary_off">"Reproducir el sonido al realizar la selección de pantalla"</string>
     <string name="play_media_notification_sounds_enable_title">"Notificaciones de tarjeta SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"Desactivar los sonidos de notificación de la tarjeta SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"Activar los sonidos de notificación de la tarjeta SD"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
+    <skip />
     <string name="sync_settings">"Sincronización de datos"</string>
     <string name="sync_settings_summary">"Seleccionar las aplicaciones que se sincronizan"</string>
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"Configuración de visualización"</string>
     <string name="animations_title">"Animación"</string>
     <string name="animations_summary_on">"Mostrar animación al abrir y cerrar ventanas"</string>
@@ -430,10 +470,18 @@
     <string name="device_info_not_available">"No disponible"</string>
     <string name="device_status_activity_title">"Estado"</string>
     <string name="device_status">"Estado"</string>
-    <string name="device_status_summary">"IMEI, número de teléfono, señal, etc."</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
     <string name="storage_settings_title">"Tarjeta SD y almacenamiento del teléfono"</string>
     <string name="storage_settings_summary">"Desmontar tarjeta SD, ver espacio de almacenamiento disponible"</string>
-    <string name="status_number">"Número de teléfono"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"Tipo de red de celulares"</string>
     <string name="status_data_state">"Estado de red de celulares"</string>
     <string name="status_service_state">"Estado del servicio"</string>
@@ -487,9 +535,11 @@
     <string name="restore_default_apn_completed">"Restablecimiento completado de configuración de APN predeterminada"</string>
     <string name="master_clear_title">"Restablecimiento de los datos de fábrica"</string>
     <string name="master_clear_summary">"Borra todos los datos del teléfono"</string>
-    <string name="master_clear_desc">"¡Esta acción restablecerá el teléfono a su estado de fábrica inicial y borrará todos los datos y aplicaciones descargadas!"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
     <string name="master_clear_button_text">"Restablecer el teléfono"</string>
-    <string name="master_clear_final_desc">"¿Deseas restablecer el teléfono y borrar todos los datos y aplicaciones? ¡Esta acción no se puede cambiar!"</string>
+    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
+    <skip />
     <string name="master_clear_final_button_text">"Borrar todo"</string>
     <string name="master_clear_gesture_prompt">"Extrae tu patrón de desbloqueo"</string>
     <string name="master_clear_gesture_explanation">"Debes extraer tu patrón de desbloqueo para confirmar el restablecimiento de un teléfono."</string>
@@ -506,13 +556,22 @@
     <string name="call_settings_summary">"Establecer correo de voz, desvío de llamadas, llamada en espera, identificador de llamadas"</string>
     <string name="network_settings_title">"Redes de celulares"</string>
     <string name="network_settings_summary">"Establecer opciones para roaming, redes, APN"</string>
-    <string name="location_title">"Mis fuentes de ubicación"</string>
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
     <string name="location_network_based">"Utilizar redes inalámbricas"</string>
     <string name="location_networks_disabled">"Ver ubicación en las aplicaciones (como Mapas) mediante redes inalámbricas"</string>
     <string name="location_neighborhood_level">"Ubicación determinada por Wi-Fi o redes de celulares"</string>
     <string name="location_gps">"Activar satélites de GPS"</string>
     <string name="location_street_level">"Localizar con una precisión del nivel de calle (deseleccionar para conservar la batería)"</string>
     <string name="location_gps_disabled">"Localizar a nivel de calle (requiere más batería además de la vista del cielo)"</string>
+    <!-- no translation found for use_location_title (7585990952633568732) -->
+    <skip />
+    <!-- no translation found for use_location_summary (4411467143899877395) -->
+    <skip />
+    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
+    <skip />
+    <string name="agree">"Acepto"</string>
+    <string name="disagree">"No acepto"</string>
     <string name="about_settings">"Acerca del teléfono"</string>
     <string name="about_settings_summary">"Ver información legal, estado del teléfono, versión de software"</string>
     <string name="legal_information">"Información legal"</string>
@@ -520,10 +579,9 @@
     <string name="copyright_title">"Derechos de autor"</string>
     <string name="license_title">"Licencia"</string>
     <string name="terms_title">"Términos y condiciones"</string>
-    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
-    <skip />
-    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
     <skip />
+    <string name="system_tutorial_list_item_summary">"Aprende cómo utilizar tu teléfono"</string>
     <string name="settings_license_activity_title">"Abrir licencias de origen"</string>
     <string name="settings_license_activity_unavailable">"Hay un problema para cargar las licencias."</string>
     <string name="settings_license_activity_loading">"Cargando…"</string>
@@ -555,9 +613,9 @@
     <string name="skip_button_label">"Cancelar"</string>
     <string name="next_button_label">"Siguiente"</string>
     <string name="lock_title">"Asegurando tu teléfono"</string>
-    <string name="lock_intro_message"><font size="17">"Protege a tu teléfono de usos no autorizados al crear un patrón de desbloqueo en la pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  En la pantalla siguiente, observa cómo se extrae un patrón de ejemplo. "\n<font height="17">\n</font><b>"2"</b>"  Cuando estés listo, extrae tu propio patrón de desbloqueo personal. Experimenta con diferentes patrones pero conecta al menos cuatro puntos. "\n<font height="17">\n</font><b>"3"</b>"  Revisa tu patrón para confirmar. "\n<font height="17">\n</font><b>"¿Estás listo para comenzar? Selecciona “Siguiente”"</b>". "\n<font height="3">\n</font>"Si deseas dejar sin protección a tu teléfono, selecciona “Cancelar”."</font></string>
+    <string name="lock_intro_message"><font size="17">"Protege a tu teléfono de usos no autorizados al crear un patrón de desbloqueo en la pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  En la pantalla siguiente, observa cómo se extrae un patrón de ejemplo. "\n<font height="17">\n</font><b>"2"</b>"  Cuando estés listo, extrae tu propio patrón de desbloqueo personal. Experimenta con diferentes patrones pero conecta al menos cuatro puntos. "\n<font height="17">\n</font><b>"3"</b>"  Revisa tu patrón para confirmar. "\n<font height="17">\n</font><b>"¿Estás listo para comenzar? Selecciona \"Siguiente\""</b>". "\n<font height="3">\n</font>"Si deseas dejar sin protección a tu teléfono, selecciona \"Cancelar\"."</font></string>
     <string name="lock_example_title">"Patrón de ejemplo"</string>
-    <string name="lock_example_message">"Conecta al menos cuatro puntos."\n" "\n"Selecciona “Siguiente” cuando estés listo para extraer tu propio patrón."</string>
+    <string name="lock_example_message">"Conecta al menos cuatro puntos."\n" "\n"Selecciona \"Siguiente\" cuando estés listo para extraer tu propio patrón."</string>
     <string name="manageapplications_settings_title">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary">"Administrar y eliminar aplicaciones instaladas"</string>
     <string name="applications_settings">"Aplicaciones"</string>
@@ -580,6 +638,8 @@
     <string name="data_size_label">"Datos"</string>
     <string name="uninstall_text">"Desinstalar..."</string>
     <string name="clear_user_data_text">"Borrar datos"</string>
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
     <string name="auto_launch_enable_text">"Has elegido lanzar esta aplicación de manera predeterminada para algunas acciones."</string>
     <string name="auto_launch_disable_text">"No hay configuraciones predeterminadas establecidas."</string>
     <string name="clear_activities">"Borrar configuraciones predeterminadas"</string>
@@ -601,10 +661,20 @@
     <string name="app_not_found_dlg_title">"No se ha encontrado la aplicación"</string>
     <string name="app_not_found_dlg_text">"No se ha encontrado la aplicación en la lista de aplicaciones instaladas."</string>
     <string name="clear_data_failed">"No se han podido borrar los datos de la aplicación."</string>
+    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
+    <skip />
     <string name="security_settings_desc">"Esta aplicación puede acceder a lo siguiente en tu teléfono:"</string>
     <string name="computing_size">"Calculando..."</string>
     <string name="invalid_size_value">"No se ha podido calcular el tamaño del paquete"</string>
     <string name="empty_list_msg">"No tienes instalada ninguna aplicación de terceros."</string>
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
     <string name="language_settings">"País y texto"</string>
     <string name="language_settings_summary">"Establecer opciones de país (idioma y región), ingreso de texto y corrección automática"</string>
     <string name="language_category">"Configuración de país"</string>
@@ -619,9 +689,8 @@
     <string name="hardkeyboard_category">"Configuración de teclado físico"</string>
     <string name="auto_punctuate_summary">"Presionar la tecla de espacio dos veces para insertar \".\""</string>
     <string name="show_password">"Contraseñas visibles"</string>
-    <string name="show_password_summary">"Mostrar contraseña cuando escribas"</string>
-    <!-- no translation found for ime_security_warning (3458652708716006477) -->
-    <skip />
+    <string name="show_password_summary">"Mostrar contraseña mientras escribe"</string>
+    <string name="ime_security_warning">"El método de entrada puede recopilar todo el texto que escribas, incluidos los datos personales como contraseñas y números de tarjetas de crédito. Proviene de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas activar este método de entrada?"</string>
     <string name="user_dict_settings_titlebar">"Diccionario del usuario"</string>
     <string name="user_dict_settings_title">"Diccionario del usuario"</string>
     <string name="user_dict_settings_summary">"Agregar y eliminar palabras del diccionario del usuario"</string>
@@ -660,6 +729,10 @@
     <string name="keep_screen_on_summary">"La pantalla nunca quedará inactiva mientras se realiza la carga"</string>
     <string name="allow_mock_location">"Permitir la creación de ubicaciones de prueba"</string>
     <string name="allow_mock_location_summary">"Permitir la creación de ubicaciones de prueba"</string>
+    <!-- no translation found for adb_warning_title (1756027479229533250) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (5352555112049663033) -->
+    <skip />
     <string name="gadget_picker_title">"Elegir gadget"</string>
     <string name="widget_picker_title">"Elegir control"</string>
     <string name="battery_history_details_for">"Detalles de %d de UID"</string>
@@ -673,10 +746,14 @@
     <string name="battery_history_system_time">"Hora del sistema:"</string>
     <string name="battery_history_total_time">"Tiempo total:"</string>
     <string name="battery_history_starts">"Comienza: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> días, <xliff:g id="HOURS">%2$d</xliff:g> horas, <xliff:g id="MINUTES">%3$d</xliff:g> minutos, <xliff:g id="SECONDS">%4$d</xliff:g> segundos"</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> horas, <xliff:g id="MINUTES">%2$d</xliff:g> minutos, <xliff:g id="SECONDS">%3$d</xliff:g> segundos"</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> minutos, <xliff:g id="SECONDS">%2$d</xliff:g> segundos"</string>
-    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> segundos"</string>
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
     <string name="battery_history_packages_sharing_this_uid">"Paquetes que comparten esta UID:"</string>
     <string name="battery_history_no_data">"No hay datos disponibles del uso de la batería"</string>
     <string name="battery_history_sensor">"Sensor:"</string>
@@ -698,4 +775,372 @@
     <string name="app_name_label">"Aplicación"</string>
     <string name="launch_count_label">"Contar"</string>
     <string name="usage_time_label">"Hora de uso"</string>
+    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
+    <skip />
+    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
+    <skip />
+    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
+    <skip />
+    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (4630925382578609056) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
+    <skip />
+    <!-- no translation found for usage_name_percent (1899151069711662289) -->
+    <skip />
+    <!-- no translation found for details_title (7564809986329021063) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (2353149143338929583) -->
+    <skip />
+    <!-- no translation found for power_wifi (2382791137776486974) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (7052979399415080971) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
+    <skip />
+    <!-- no translation found for battery_action_display (5302763261448580102) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3003604969548979254) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (1834412555123982714) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for tts_settings (6454363854545277027) -->
+    <skip />
+    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (5064947197040356736) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_demo (405357591189935876) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for gadget_title (7455548605888590466) -->
+    <skip />
+    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
+    <skip />
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
+    <skip />
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
+    <skip />
+    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
+    <skip />
+    <!-- no translation found for vpn_no_button (7620339571187119107) -->
+    <skip />
+    <!-- no translation found for vpn_back_button (192036339792734970) -->
+    <skip />
+    <!-- no translation found for vpn_mistake_button (1759404628590603933) -->
+    <skip />
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <!-- no translation found for vpn_connecting (8039521381692090116) -->
+    <skip />
+    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
+    <skip />
+    <!-- no translation found for vpn_connected (7641723116362845781) -->
+    <skip />
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index b5670e7..87d4762 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -32,18 +32,44 @@
     <item>"10 minutos"</item>
     <item>"Tiempo de espera ilimitado"</item>
   </string-array>
+  <string-array name="tts_rate_entries">
+    <item>"Muy lenta"</item>
+    <item>"Lenta"</item>
+    <item>"Normal"</item>
+    <item>"Rápida"</item>
+    <item>"Muy rápida"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item>"Muy bajo"</item>
+    <item>"Bajo"</item>
+    <item>"Normal"</item>
+    <item>"Alto"</item>
+    <item>"Muy alto"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item>"Inglés (Estados Unidos)"</item>
+    <item>"Inglés (Gran Bretaña)"</item>
+    <item>"Francés"</item>
+    <item>"Alemán"</item>
+    <item>"Italiano"</item>
+    <item>"Español"</item>
+  </string-array>
   <string-array name="wifi_security_entries">
     <item>"Automática"</item>
     <item>"Ninguna"</item>
     <item>"WEP"</item>
     <item>"WPA Personal"</item>
     <item>"WPA2 Personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item>"Ninguna"</item>
     <item>"WEP"</item>
     <item>"WPA Personal"</item>
     <item>"WPA2 Personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item>"Automáticamente"</item>
@@ -73,4 +99,19 @@
     <item>"Número de inicios"</item>
     <item>"Nombre de la aplicación"</item>
   </string-array>
+  <string-array name="wifi_eap_entries">
+    <item>"PEAP"</item>
+    <item>"TLS"</item>
+    <item>"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item>"Ninguno"</item>
+    <item>"PAP"</item>
+    <item>"MSCHAP"</item>
+    <item>"MSCHAP2"</item>
+    <item>"GTC"</item>
+  </string-array>
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5e6c425..ad85dbb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -107,7 +107,10 @@
     <string name="date_and_time">"Configuración de fecha y hora"</string>
     <string name="date_time_12_hour_sample">"1:00 p.m."</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Cambiar hora"</string>
+    <string name="date_time_changeDate_text">"Fecha"</string>
     <string name="choose_timezone">"Seleccionar zona horaria"</string>
+    <string name="normal_date_format">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label">"Vista previa:"</string>
     <string name="display_font_size_label">"Tamaño de fuente:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -188,18 +191,29 @@
     <string name="proxy_settings_label">"Configuración de proxy"</string>
     <string name="cancel">"Cancelar"</string>
     <string name="settings_label">"Ajustes"</string>
+    <string name="settings_shortcut">"Configuración"</string>
     <string name="airplane_mode">"Modo avión"</string>
     <string name="airplane_mode_summary">"Inhabilitar todas las conexiones inalámbricas"</string>
     <string name="airplane_mode_turning_on">"Inhabilitando conexiones inalámbricas..."</string>
     <string name="airplane_mode_turning_off">"Habilitando conexiones inalámbricas..."</string>
     <string name="radio_controls_title">"Conexiones inalámbricas"</string>
-    <string name="radio_controls_summary">"Administrar Wi-Fi, Bluetooth, modo avión y redes móviles"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <string name="roaming">"Itinerancia de datos"</string>
+    <string name="roaming_enable">"Establecer conexión con servicios de datos en itinerancia"</string>
+    <string name="roaming_disable">"Establecer conexión con servicios de datos en itinerancia"</string>
+    <string name="roaming_reenable_message">"Has perdido la conectividad de datos porque has dejado desactivada la itinerancia de datos de tu red doméstica."</string>
+    <string name="roaming_turn_it_on_button">"Activarla"</string>
+    <string name="roaming_warning">"¿Permitir itinerancia de datos? Los costes de itinerancia que deberás asumir pueden ser significativos."</string>
+    <string name="roaming_reenable_title">"Atención"</string>
+    <string name="networks">"Selección de operador"</string>
+    <string name="sum_carrier_select">"Seleccionar un operador de red"</string>
     <string name="date_and_time_settings_title">"Fecha y hora"</string>
     <string name="date_and_time_settings_summary">"Establecer fecha, hora, zona horaria y formatos"</string>
     <string name="date_time_auto">"Automático"</string>
     <string name="date_time_auto_summaryOn">"Utilizar valores proporcionados por la red"</string>
     <string name="date_time_auto_summaryOff">"Utilizar valores proporcionados por la red"</string>
-    <string name="date_time_24hour">"Utilizar formato de 24 horas"</string>
+    <string name="date_time_24hour">"Formato de 24 horas"</string>
     <string name="date_time_set_time">"Establecer hora"</string>
     <string name="date_time_set_timezone">"Seleccionar zona horaria"</string>
     <string name="date_time_set_date">"Establecer fecha"</string>
@@ -207,7 +221,8 @@
     <string name="zone_list_menu_sort_alphabetically">"Ordenar alfabéticamente"</string>
     <string name="zone_list_menu_sort_by_timezone">"Ordenar por zona horaria"</string>
     <string name="security_settings_title">"Seguridad y ubicación"</string>
-    <string name="security_settings_summary">"Establecer ubicación, bloqueo de pantalla y bloqueo de tarjeta SIM"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"Contraseñas"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Activar Bluetooth"</string>
@@ -220,6 +235,8 @@
     <string name="bluetooth_error_title">"Atención"</string>
     <string name="bluetooth_pairing_error_message">"Se ha producido un problema al realizar la sincronización con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message">"Se ha producido un problema al realizar la sincronización con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, porque el PIN introducido es incorrecto."</string>
+    <string name="bluetooth_pairing_device_down_error_message">"No se puede establecer comunicación con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message">"Sincronización rechazada por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message">"Se ha producido un problema al establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title">"Buscar dispositivos"</string>
     <string name="bluetooth_device_context_connect">"Establecer conexión"</string>
@@ -260,11 +277,15 @@
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <string name="wifi_security_wpa_eap">"WPA-EAP"</string>
+    <string name="wifi_security_ieee8021x">"IEEE8021X"</string>
     <string name="wifi_security_unknown">"Desconocida"</string>
-    <string name="wifi_security_verbose_open">"Red abierta"</string>
-    <string name="wifi_security_verbose_wep">"Protegido con WEP"</string>
-    <string name="wifi_security_verbose_wpa">"Protegida con WPA"</string>
-    <string name="wifi_security_verbose_wpa2">"Protegida con WPA2"</string>
+    <string name="wifi_security_verbose_open">"red abierta"</string>
+    <string name="wifi_security_verbose_wep">"protegida con WEP"</string>
+    <string name="wifi_security_verbose_wpa">"protegida con WPA"</string>
+    <string name="wifi_security_verbose_wpa2">"protegida con WPA2"</string>
+    <string name="wifi_security_verbose_wpa_eap">"protegida con WPA-EAP"</string>
+    <string name="wifi_security_verbose_ieee8021x">"protegida con IEEE 802.1x"</string>
     <string name="ip_address">"Dirección IP"</string>
     <string name="signal">"Intensidad de la señal"</string>
     <string name="wifi_starting">"Activando..."</string>
@@ -277,12 +298,19 @@
     <string name="error_saving">"No se ha podido guardar la red."</string>
     <string name="connect">"Establecer conexión"</string>
     <string name="connect_to_blank">"Establecer conexión con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="please_select_eap">"Método EAP"</string>
+    <string name="please_select_phase2">"Autenticación de fase 2"</string>
+    <string name="please_type_identity">"Identidad"</string>
+    <string name="please_type_anonymous_identity">"Identidad anónima"</string>
+    <string name="please_select_client_certificate">"Certificado de cliente"</string>
+    <string name="please_select_ca_certificate">"Certificado de autenticación"</string>
+    <string name="please_type_private_key_passwd">"Contraseña de clave privada"</string>
     <string name="please_type_passphrase">"Contraseña de red inalámbrica"</string>
     <string name="please_type_hex_key">"Clave hex. WEP (0-9, A-F)"</string>
     <string name="wifi_show_password">"Mostrar contraseña"</string>
     <string name="scan_wifi">"Buscar"</string>
     <string name="summary_not_in_range">"Fuera de rango"</string>
-    <string name="summary_remembered">"Recordada"</string>
+    <string name="summary_remembered">"recordada"</string>
     <string name="summary_connection_failed">"La conexión no se ha realizado correctamente; selecciónala para volver a intentarlo."</string>
     <string name="wifi_access_points">"Redes Wi-Fi"</string>
     <string name="wifi_type_ssid">"SSID de red"</string>
@@ -359,11 +387,14 @@
     <string name="sound_effects_enable_title">"Selección sonora"</string>
     <string name="sound_effects_enable_summary_on">"Reproducir sonido cuando se realiza una selección de pantalla"</string>
     <string name="sound_effects_enable_summary_off">"Reproducir sonido cuando se realiza una selección de pantalla"</string>
-    <string name="play_media_notification_sounds_enable_title">"Notificaciones de la tarjeta SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"Inhabilitar sonidos de notificación de la tarjeta SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"Habilitar sonidos de notificación de la tarjeta SD"</string>
+    <string name="play_media_notification_sounds_enable_title">"Notificaciones tarjeta SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_on">"Reproducir sonido para notificaciones de la tarjeta SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_off">"Reproducir sonido para notificaciones de la tarjeta SD"</string>
     <string name="sync_settings">"Sincronización de datos"</string>
     <string name="sync_settings_summary">"Seleccionar las aplicaciones que están sincronizadas"</string>
+    <string name="search_settings">"Buscar"</string>
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"Configuración de pantalla"</string>
     <string name="animations_title">"Animación"</string>
     <string name="animations_summary_on">"Mostrar animación al abrir y cerrar ventanas"</string>
@@ -373,10 +404,10 @@
     <string name="accelerometer_summary_off">"Cambiar orientación automáticamente al girar el teléfono"</string>
     <string name="brightness">"Brillo"</string>
     <string name="brightness_summary">"Ajustar el brillo de la pantalla"</string>
-    <string name="screen_timeout">"Tiempo de espera de pantalla"</string>
+    <string name="screen_timeout">"Tiempo espera pantalla"</string>
     <string name="screen_timeout_summary">"Ajustar el tiempo de retraso antes de que la pantalla se apague automáticamente"</string>
     <string name="sim_lock_settings">"Configuración de bloqueo de tarjeta SIM"</string>
-    <string name="sim_lock_settings_category">"Configurar bloqueo de tarjeta SIM"</string>
+    <string name="sim_lock_settings_category">"Bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_title">"Bloqueo de tarjeta SIM"</string>
     <string name="sim_pin_toggle">"Bloquear tarjeta SIM"</string>
     <string name="sim_lock_on">"Solicitar PIN para utilizar el teléfono"</string>
@@ -407,17 +438,25 @@
     <string name="device_info_not_available">"No disponible"</string>
     <string name="device_status_activity_title">"Estado"</string>
     <string name="device_status">"Estado"</string>
-    <string name="device_status_summary">"IMEI, número de teléfono, señal, etc."</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
     <string name="storage_settings_title">"Almacenamiento"</string>
-    <string name="storage_settings_summary">"Tarjeta de SD sin activar, ver almacenamiento disponible"</string>
-    <string name="status_number">"Número de teléfono"</string>
+    <string name="storage_settings_summary">"Desactivar tarjeta SD, ver almacenamiento disponible."</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"Tipo de red móvil"</string>
     <string name="status_data_state">"Estado de red móvil"</string>
     <string name="status_service_state">"Estado del servicio"</string>
     <string name="status_signal_strength">"Intensidad de la señal"</string>
     <string name="status_roaming">"Itinerancia"</string>
     <string name="status_operator">"Red"</string>
-    <string name="status_wifi_mac_address">"Dirección MAC de la red Wi-Fi"</string>
+    <string name="status_wifi_mac_address">"Dirección MAC de Wi-Fi"</string>
     <string name="status_bt_address">"Dirección de Bluetooth"</string>
     <string name="status_unavailable">"No disponible"</string>
     <string name="status_up_time">"Tiempo de actividad"</string>
@@ -462,11 +501,12 @@
     <string name="restore_default_apn">"Restaurando la configuración de APN predeterminada"</string>
     <string name="menu_restore">"Restablecer valores predeterminados"</string>
     <string name="restore_default_apn_completed">"Restablecimiento de la configuración de APN predeterminada completado"</string>
-    <string name="master_clear_title">"Restablecer datos de fábrica"</string>
+    <string name="master_clear_title">"Rest. datos de fábrica"</string>
     <string name="master_clear_summary">"Borrar todos los datos del teléfono"</string>
-    <string name="master_clear_desc">"Esta acción restablecerá el teléfono a su estado de fábrica inicial y borrará todos los datos y todas las aplicaciones descargadas."</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
     <string name="master_clear_button_text">"Reiniciar teléfono"</string>
-    <string name="master_clear_final_desc">"¿Deseas reiniciar el teléfono y borrar todos los datos y todas las aplicaciones? Recuerda que esta acción no se puede deshacer."</string>
+    <string name="master_clear_final_desc">"¿Quieres borrar toda tu información personal y las aplicaciones que has descargado? Esta acción no se puede deshacer."</string>
     <string name="master_clear_final_button_text">"Borrar todo"</string>
     <string name="master_clear_gesture_prompt">"Crea tu patrón de desbloqueo."</string>
     <string name="master_clear_gesture_explanation">"Debes crear un patrón de desbloqueo para confirmar el reinicio del teléfono."</string>
@@ -483,13 +523,18 @@
     <string name="call_settings_summary">"Configurar buzón, llamada en espera, desvío e identificador"</string>
     <string name="network_settings_title">"Redes móviles"</string>
     <string name="network_settings_summary">"Establecer opciones para itinerancia, redes, APN"</string>
-    <string name="location_title">"Fuentes de Mi Ubicación"</string>
+    <string name="location_title">"Mi ubicación"</string>
     <string name="location_network_based">"Usar redes inalámbricas"</string>
     <string name="location_networks_disabled">"Para ver una ubicación en aplicaciones (por ejemplo, Google Maps)"</string>
     <string name="location_neighborhood_level">"Ubicación determinada por redes móviles o Wi-Fi"</string>
     <string name="location_gps">"Habilitar satélites GPS"</string>
     <string name="location_street_level">"Preciso en el nivel de calle (anula la selección para ahorrar batería)"</string>
     <string name="location_gps_disabled">"Localizar en nivel de calle (requiere más batería además de la vista aérea)"</string>
+    <string name="use_location_title">"Compartir con Google"</string>
+    <string name="use_location_summary">"Permitir que Google utilice tu ubicación para mejorar las búsquedas y otros servicios"</string>
+    <string name="use_location_warning_message">"Permitir que Google utilice tu ubicación para mejorar los resultados de búsqueda y otros servicios"</string>
+    <string name="agree">"Acepto"</string>
+    <string name="disagree">"No acepto"</string>
     <string name="about_settings">"Acerca del teléfono"</string>
     <string name="about_settings_summary">"Ver información legal, estado del teléfono, versión del software"</string>
     <string name="legal_information">"Información legal"</string>
@@ -499,7 +544,7 @@
     <string name="terms_title">"Términos y condiciones"</string>
     <string name="system_tutorial_list_item_title">"Tutorial del sistema"</string>
     <string name="system_tutorial_list_item_summary">"Aprende a utilizar tu teléfono"</string>
-    <string name="settings_license_activity_title">"Licencias de software libre"</string>
+    <string name="settings_license_activity_title">"Licencias de SW libre"</string>
     <string name="settings_license_activity_unavailable">"Se ha producido un problema al intentar cargar las licencias."</string>
     <string name="settings_license_activity_loading">"Cargando..."</string>
     <string name="lock_settings_title">"Patrón de desbloqueo de pantalla"</string>
@@ -521,8 +566,8 @@
     <string name="lockpattern_settings_enable_title">"Patrón obligatorio"</string>
     <string name="lockpattern_settings_enable_summary">"Se debe crear un patrón para desbloquear la pantalla."</string>
     <string name="lockpattern_settings_enable_visible_pattern_title">"Utilizar patrón visible"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title">"Utilizar comentarios al crear patrón"</string>
-    <string name="lockpattern_settings_choose_lock_pattern">"Establecer patrón de desbloqueo"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"Comentarios al crear patrón"</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"Patrón de desbloqueo"</string>
     <string name="lockpattern_settings_change_lock_pattern">"Cambiar patrón de desbloqueo"</string>
     <string name="lockpattern_settings_help_how_to_record">"Cómo crear un patrón de desbloqueo"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Se han realizado demasiados intentos incorrectos."</string>
@@ -555,6 +600,7 @@
     <string name="data_size_label">"Datos"</string>
     <string name="uninstall_text">"Desinstalar"</string>
     <string name="clear_user_data_text">"Borrar datos"</string>
+    <string name="app_factory_reset">"Desinstalar actualizaciones"</string>
     <string name="auto_launch_enable_text">"Has elegido ejecutar la aplicación de forma predeterminada para algunas acciones."</string>
     <string name="auto_launch_disable_text">"No se han establecido valores predeterminados."</string>
     <string name="clear_activities">"Borrar valores predeterminados"</string>
@@ -576,15 +622,20 @@
     <string name="app_not_found_dlg_title">"No se ha encontrado la aplicación."</string>
     <string name="app_not_found_dlg_text">"No se ha encontrado la aplicación en la lista de aplicaciones instaladas."</string>
     <string name="clear_data_failed">"No se han podido borrar los datos de aplicación."</string>
+    <string name="app_factory_reset_dlg_title">"Desinstalar actualizaciones"</string>
+    <string name="app_factory_reset_dlg_text">"¿Quieres desinstalar todas las actualizaciones de esta aplicación del sistema Android?"</string>
+    <string name="clear_failed_dlg_title">"Borrar datos"</string>
+    <string name="clear_failed_dlg_text">"Error al borrar los datos de la aplicación"</string>
     <string name="security_settings_desc">"Esta aplicación puede acceder a los siguientes elementos del teléfono:"</string>
     <string name="computing_size">"Calculando…"</string>
     <string name="invalid_size_value">"No se ha podido calcular el tamaño del paquete."</string>
     <string name="empty_list_msg">"No tienes instalada ninguna aplicación externa."</string>
+    <string name="version_text">"versión <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="language_settings">"Idioma y país"</string>
     <string name="language_settings_summary">"Configuración local, opciones de autocorrección e introducción de texto"</string>
     <string name="language_category">"Configuración local"</string>
     <string name="text_category">"Configuración de texto"</string>
-    <string name="phone_language">"Seleccionar configuración local"</string>
+    <string name="phone_language">"Configuración local"</string>
     <string name="phone_language_summary">"Seleccionar idioma y región"</string>
     <string name="auto_replace">"Corrección automática"</string>
     <string name="auto_replace_summary">"Corregir palabras con errores de escritura"</string>
@@ -600,7 +651,7 @@
     <string name="user_dict_settings_title">"Diccionario del usuario"</string>
     <string name="user_dict_settings_summary">"Añadir y eliminar palabras del diccionario del usuario"</string>
     <string name="user_dict_settings_add_menu_title">"Añadir"</string>
-    <string name="user_dict_settings_add_dialog_title">"Añadir al usuario"</string>
+    <string name="user_dict_settings_add_dialog_title">"Añadir al diccionario"</string>
     <string name="user_dict_settings_edit_dialog_title">"Editar palabra"</string>
     <string name="user_dict_settings_context_menu_edit_title">"Editar"</string>
     <string name="user_dict_settings_context_menu_delete_title">"Suprimir"</string>
@@ -632,8 +683,10 @@
     <string name="enable_adb_summary">"Modo de depuración cuando está conectado el dispositivo USB"</string>
     <string name="keep_screen_on">"Pantalla activa"</string>
     <string name="keep_screen_on_summary">"La pantalla nunca entra en modo de suspensión durante la carga"</string>
-    <string name="allow_mock_location">"Permitir ubicaciones simuladas"</string>
+    <string name="allow_mock_location">"Ubicaciones simuladas"</string>
     <string name="allow_mock_location_summary">"Permitir ubicaciones simuladas"</string>
+    <string name="adb_warning_title">"¿Quieres habilitar la depuración USB?"</string>
+    <string name="adb_warning_message">"La depuración USB sólo está indicada para actividades de desarrollo. Se puede utilizar para intercambiar datos entre el equipo y el dispositivo, para instalar aplicaciones en el dispositivo sin recibir notificaciones y para leer datos de registro."</string>
     <string name="gadget_picker_title">"Seleccionar gadget"</string>
     <string name="widget_picker_title">"Seleccionar widget"</string>
     <string name="battery_history_details_for">"Detalles del ID único %d"</string>
@@ -647,10 +700,10 @@
     <string name="battery_history_system_time">"Tiempo del sistema:"</string>
     <string name="battery_history_total_time">"Tiempo total"</string>
     <string name="battery_history_starts">"Inicios: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> días, <xliff:g id="HOURS">%2$d</xliff:g> horas, <xliff:g id="MINUTES">%3$d</xliff:g> minutos, <xliff:g id="SECONDS">%4$d</xliff:g> segundos"</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> horas, <xliff:g id="MINUTES">%2$d</xliff:g> minutos, <xliff:g id="SECONDS">%3$d</xliff:g> segundos"</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> minutos, <xliff:g id="SECONDS">%2$d</xliff:g> segundos"</string>
-    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> segundos"</string>
+    <string name="battery_history_days">"<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> min <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
+    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
+    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
+    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
     <string name="battery_history_packages_sharing_this_uid">"Paquetes que comparten este ID único:"</string>
     <string name="battery_history_no_data">"No hay datos disponibles sobre el uso de la batería."</string>
     <string name="battery_history_sensor">"Sensor:"</string>
@@ -672,4 +725,277 @@
     <string name="app_name_label">"Aplicación"</string>
     <string name="launch_count_label">"Número"</string>
     <string name="usage_time_label">"Tiempo de uso"</string>
+    <string name="accessibility_settings_title">"Accesibilidad"</string>
+    <string name="accessibility_settings_summary">"Administrar opciones de accesibilidad"</string>
+    <string name="toggle_accessibility_title">"Accesibilidad"</string>
+    <string name="accessibility_services_category">"Servicios de accesibilidad"</string>
+    <string name="no_accessibility_services_summary">"No hay instalado ningún servicio de accesibilidad."</string>
+    <string name="accessibility_service_security_warning">"Este servicio de accesibilidad puede recopilar todo el texto que escribas, desde datos personales hasta números de tarjetas de crédito, a excepción de las contraseñas. También puede registrar las interacciones con la interfaz de usuario. Procede de la aplicación <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. ¿Quieres habilitar ese servicio de accesibilidad?"</string>
+    <string name="accessibility_service_disable_warning">"¿Quieres inhabilitar la accesibilidad?"</string>
+    <string name="power_usage_summary_title">"Uso de la batería"</string>
+    <string name="power_usage_summary">"Qué ha estado utilizando la batería"</string>
+    <string name="battery_since_unplugged">"Uso de la batería desde que se desenchufó"</string>
+    <string name="battery_since_reset">"Uso de la batería desde que se restableció"</string>
+    <string name="battery_stats_duration">"<xliff:g id="TIME">%1$s</xliff:g> desde que se desenchufó"</string>
+    <string name="awake">"Tiempo de actividad del dispositivo"</string>
+    <string name="wifi_on_time">"Tiempo de conexión WiFi"</string>
+    <string name="bluetooth_on_time">"Tiempo de conexión WiFi"</string>
+    <string name="usage_name_percent">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="PERCENT">%2$s</xliff:g>%%"</string>
+    <string name="details_title">"Detalles de uso de la batería"</string>
+    <string name="details_subtitle">"Detalles de uso"</string>
+    <string name="controls_subtitle">"Ajustar uso de la batería"</string>
+    <string name="packages_subtitle">"Paquetes incluidos"</string>
+    <string name="power_screen">"Pantalla"</string>
+    <string name="power_wifi">"Wi-Fi"</string>
+    <string name="power_bluetooth">"Bluetooth"</string>
+    <string name="power_cell">"Dispositivo inactivo"</string>
+    <string name="power_phone">"Llamadas de voz"</string>
+    <string name="power_idle">"Teléfono inactivo"</string>
+    <string name="usage_type_cpu">"Total de CPU"</string>
+    <string name="usage_type_cpu_foreground">"Primer plano de la CPU"</string>
+    <string name="usage_type_gps">"GPS"</string>
+    <string name="usage_type_phone">"Teléfono"</string>
+    <string name="usage_type_data_send">"Datos enviados"</string>
+    <string name="usage_type_data_recv">"Datos recibidos"</string>
+    <string name="usage_type_audio">"Audio"</string>
+    <string name="usage_type_video">"Vídeo"</string>
+    <string name="usage_type_on_time">"Tiempo de conexión"</string>
+    <string name="battery_action_stop">"Forzar detención"</string>
+    <string name="battery_action_app_details">"Información de la aplicación"</string>
+    <string name="battery_action_app_settings">"Configuración de aplicaciones"</string>
+    <string name="battery_action_display">"Configuración de pantalla"</string>
+    <string name="battery_action_wifi">"Configuración WiFi"</string>
+    <string name="battery_action_bluetooth">"Configuración de Bluetooth"</string>
+    <string name="battery_desc_voice">"Batería utilizada por llamadas de voz"</string>
+    <string name="battery_desc_standby">"Batería utilizada cuando el teléfono está inactivo"</string>
+    <string name="battery_desc_radio">"Batería utilizada por la radio"</string>
+    <string name="battery_sugg_radio">"Cambia a modo avión para ahorrar batería en zonas sin cobertura."</string>
+    <string name="battery_desc_display">"Batería utilizada por la pantalla y por la retroiluminación"</string>
+    <string name="battery_sugg_display">"Reduce el brillo y el tiempo de espera de la pantalla."</string>
+    <string name="battery_desc_wifi">"Batería utilizada por la conexión Wi-Fi"</string>
+    <string name="battery_sugg_wifi">"Desactiva la conexión WiFi cuando no la estés utilizando o cuando no esté disponible."</string>
+    <string name="battery_desc_bluetooth">"Batería utilizada por Bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic">"Desactiva el Bluetooth cuando no lo estés utilizando."</string>
+    <string name="battery_sugg_bluetooth_headset">"Intenta conectarte a un dispositivo Bluetooth diferente."</string>
+    <string name="battery_desc_apps">"Batería utilizada por aplicaciones en ejecución"</string>
+    <string name="battery_sugg_apps_info">"Detener o desinstalar la aplicación"</string>
+    <string name="battery_sugg_apps_gps">"Desactivar GPS cuando no se esté utilizando"</string>
+    <string name="battery_sugg_apps_settings">"La aplicación puede incluir opciones que permitan reducir el uso de la batería."</string>
+    <string name="menu_stats_unplugged">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desenchufó"</string>
+    <string name="menu_stats_last_unplugged">"Desde la última vez que se desenchufó para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total">"Total de consumo"</string>
+    <string name="menu_stats_refresh">"Actualizar"</string>
+    <string name="process_kernel_label">"Sistema operativo de Android"</string>
+    <string name="process_mediaserver_label">"Servidor multimedia"</string>
+    <string name="tts_settings">"Síntesis de voz"</string>
+    <string name="tts_settings_summary">"Establecer opciones de síntesis de voz"</string>
+    <string name="tts_settings_title">"Controles del sintetizador de voz"</string>
+    <string name="use_default_tts_settings_title">"Utilizar siempre mi configuración"</string>
+    <string name="use_default_tts_settings_summary">"La configuración predeterminada que aparece a continuación anula la configuración de la aplicación."</string>
+    <string name="tts_default_settings_section">"Configuración predeterminada"</string>
+    <string name="tts_default_rate_title">"Velocidad de voz"</string>
+    <string name="tts_default_rate_summary">"Velocidad a la que se lee el texto"</string>
+    <string name="tts_default_pitch_title">"Tono"</string>
+    <string name="tts_default_pitch_summary">"Afecta al tono del texto hablado."</string>
+    <string name="tts_default_lang_title">"Idioma"</string>
+    <string name="tts_default_lang_summary">"Establece la voz del idioma específico para el texto hablado."</string>
+    <string name="tts_play_example_title">"Escuchar un ejemplo"</string>
+    <string name="tts_play_example_summary">"Reproducir una breve demostración de síntesis de voz"</string>
+    <string name="tts_install_data_title">"Instalar archivos de datos de voz"</string>
+    <string name="tts_install_data_summary">"Instalar los archivos de datos de voz necesarios para la síntesis de voz"</string>
+    <string name="tts_data_installed_summary">"Las voces necesarias para la síntesis de voz ya están instaladas correctamente."</string>
+    <string name="tts_demo">"Este es un ejemplo de síntesis de voz."</string>
+    <string name="tts_settings_changed_demo">"Tu configuración ha cambiado. Este es un ejemplo de cómo suena."</string>
+    <string name="gadget_title">"Control de energía"</string>
+    <string name="vpn_settings_activity_title">"Configuración de red VPN"</string>
+    <string name="vpn_connect_to">"Establecer conexión con %s"</string>
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <string name="vpn_password_colon">"Contraseña:"</string>
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <string name="vpn_connect_button">"Establecer conexión"</string>
+    <string name="vpn_yes_button">"Sí"</string>
+    <string name="vpn_no_button">"No"</string>
+    <string name="vpn_back_button">"Anterior"</string>
+    <string name="vpn_mistake_button">"No, es un error."</string>
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <string name="vpn_connecting">"Estableciendo conexión..."</string>
+    <string name="vpn_disconnecting">"Desconectando..."</string>
+    <string name="vpn_connected">"Conectada"</string>
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <string name="vpn_profile_added">"%s añadido"</string>
+    <string name="vpn_profile_replaced">"Los cambios se han aplicado en %s."</string>
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index ea913a6..f10eea1 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -32,18 +32,44 @@
     <item>"10 minutes"</item>
     <item>"Ne jamais désactiver"</item>
   </string-array>
+  <string-array name="tts_rate_entries">
+    <item>"Très lente"</item>
+    <item>"Lente"</item>
+    <item>"Normale"</item>
+    <item>"Rapide"</item>
+    <item>"Très rapide"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item>"Très grave"</item>
+    <item>"Grave"</item>
+    <item>"Normale"</item>
+    <item>"Aigu"</item>
+    <item>"Très aigu"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item>"Anglais (États-Unis)"</item>
+    <item>"Anglais (Royaume-Uni)"</item>
+    <item>"Français"</item>
+    <item>"Allemand"</item>
+    <item>"Italien"</item>
+    <item>"Espagnol"</item>
+  </string-array>
   <string-array name="wifi_security_entries">
     <item>"Automatique"</item>
     <item>"Aucune"</item>
     <item>"WEP"</item>
-    <item>"WPA personnel"</item>
-    <item>"WPA2 personnel"</item>
+    <item>"WPA-PSK"</item>
+    <item>"WPA2-PSK"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item>"Aucun"</item>
     <item>"WEP"</item>
-    <item>"WPA personnel"</item>
-    <item>"WPA2 personnel"</item>
+    <item>"WPA-PSK"</item>
+    <item>"WPA2-PSK"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item>"Automatique"</item>
@@ -73,4 +99,19 @@
     <item>"Nombre de lancements"</item>
     <item>"Nom de l\'application"</item>
   </string-array>
+  <string-array name="wifi_eap_entries">
+    <item>"PEAP"</item>
+    <item>"TLS"</item>
+    <item>"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item>"Aucun"</item>
+    <item>"PAP"</item>
+    <item>"MSCHAP"</item>
+    <item>"MSCHAP2"</item>
+    <item>"GTC"</item>
+  </string-array>
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 26abe66..c1d4893 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,8 +16,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Inconnu"</string>
-    <string name="turn_on_radio">"Allumer la radio"</string>
-    <string name="turn_off_radio">"Éteindre la radio"</string>
+    <string name="turn_on_radio">"Allumer le signal radio"</string>
+    <string name="turn_off_radio">"Éteindre le signal radio"</string>
     <string name="turn_on_qxdm">"Activer le journal SD QXDM"</string>
     <string name="turn_off_qxdm">"Désactiver le journal QXMD SD"</string>
     <string name="radioInfo_menu_viewADN">"Afficher le carnet d\'adresses de la carte SIM"</string>
@@ -31,7 +31,7 @@
     <string name="radioInfo_service_in">"Service en cours"</string>
     <string name="radioInfo_service_out">"Hors-service"</string>
     <string name="radioInfo_service_emergency">"Appels d\'urgence uniquement"</string>
-    <string name="radioInfo_service_off">"Radio désactivée"</string>
+    <string name="radioInfo_service_off">"Signal radio désactivé"</string>
     <string name="radioInfo_roaming_in">"Itinérance"</string>
     <string name="radioInfo_roaming_not">"Sans itinérance"</string>
     <string name="radioInfo_phone_idle">"Inactif"</string>
@@ -69,7 +69,7 @@
     <string name="battery_info_awake_plugged">"Temps en activité lors du rechargement :"</string>
     <string name="battery_info_screen_on">"Écran activé :"</string>
     <string name="battery_info_status_unknown">"Inconnu"</string>
-    <string name="battery_info_status_charging">"Chargement"</string>
+    <string name="battery_info_status_charging">"Batterie en charge"</string>
     <string name="battery_info_status_charging_ac">"(AC)"</string>
     <string name="battery_info_status_charging_usb">"(USB)"</string>
     <string name="battery_info_status_discharging">"Baisse du niveau de charge"</string>
@@ -88,7 +88,7 @@
     <string name="bluetooth_devices">"Appareils Bluetooth"</string>
     <string name="bluetooth_device_name">"Nom de l\'appareil"</string>
     <string name="bluetooth_name_not_set">"Aucun nom n\'a été défini. Utilisation du nom du compte..."</string>
-    <string name="bluetooth_scan_for_devices">"Rechercher d\'appareils"</string>
+    <string name="bluetooth_scan_for_devices">"Recherche d\'appareils"</string>
     <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être déconnecté."</string>
     <string name="bluetooth_connected">"Connecté"</string>
     <string name="bluetooth_disconnected">"Déconnecté"</string>
@@ -107,7 +107,10 @@
     <string name="date_and_time">"Paramètres d\'heure et de date"</string>
     <string name="date_time_12_hour_sample">"13:00 h"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Changer l\'heure"</string>
+    <string name="date_time_changeDate_text">"Date"</string>
     <string name="choose_timezone">"Choisir fuseau horaire"</string>
+    <string name="normal_date_format">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label">"Aperçu :"</string>
     <string name="display_font_size_label">"Taille de police :"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -133,7 +136,7 @@
     <string name="radio_info_data_attempts_label">"Tentatives :"</string>
     <string name="radio_info_gprs_service_label">"Service GPRS :"</string>
     <string name="radio_info_roaming_label">"Itinérance :"</string>
-    <string name="radio_info_imei_label">"IIEM :"</string>
+    <string name="radio_info_imei_label">"Code IMEI :"</string>
     <string name="radio_info_call_redirect_label">"Redirection des appels :"</string>
     <string name="radio_info_ppp_resets_label">"Nombre de réinitialisations PPP depuis le démarrage :"</string>
     <string name="radio_info_gsm_disconnects_label">"Déconnexions GSM :"</string>
@@ -144,7 +147,7 @@
     <string name="radio_info_signal_strength_label">"Intensité du signal :"</string>
     <string name="radio_info_call_status_label">"État de l\'appel :"</string>
     <string name="radio_info_ppp_sent_label">"PPP envoyés :"</string>
-    <string name="radio_info_radio_resets_label">"Réinitialisations de la radio :"</string>
+    <string name="radio_info_radio_resets_label">"Réinitialisations du signal radio :"</string>
     <string name="radio_info_message_waiting_label">"Message en attente :"</string>
     <string name="radio_info_phone_number_label">"Numéro de téléphone :"</string>
     <string name="radio_info_band_mode_label">"Choisir une bande radio"</string>
@@ -188,12 +191,23 @@
     <string name="proxy_settings_label">"Paramètres proxy"</string>
     <string name="cancel">"Annuler"</string>
     <string name="settings_label">"Paramètres"</string>
+    <string name="settings_shortcut">"Paramètres"</string>
     <string name="airplane_mode">"Mode avion"</string>
     <string name="airplane_mode_summary">"Désactiver toutes les connexions sans fil"</string>
     <string name="airplane_mode_turning_on">"Désactivation des connexions sans fil…"</string>
     <string name="airplane_mode_turning_off">"Activation des connexions sans fil…"</string>
     <string name="radio_controls_title">"Connexions sans fil"</string>
-    <string name="radio_controls_summary">"Gérer le Wi-Fi, le mode Bluetooth, le mode avion et les réseaux mobiles"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <string name="roaming">"Itinérance des données"</string>
+    <string name="roaming_enable">"Se connecter aux services de données lors de l\'itinérance"</string>
+    <string name="roaming_disable">"Se connecter aux services de données lors de l\'itinérance"</string>
+    <string name="roaming_reenable_message">"Vous avez été déconnecté, car vous avez quitté votre réseau domestique et l\'itinérance des données est désactivée."</string>
+    <string name="roaming_turn_it_on_button">"Activer"</string>
+    <string name="roaming_warning">"Autoriser l\'itinérance des données ? Des frais d\'itinérance importants peuvent s\'appliquer !"</string>
+    <string name="roaming_reenable_title">"Attention"</string>
+    <string name="networks">"Sélection de l\'opérateur"</string>
+    <string name="sum_carrier_select">"Choisir un opérateur réseau"</string>
     <string name="date_and_time_settings_title">"Date et heure"</string>
     <string name="date_and_time_settings_summary">"Configurer la date, l\'heure, le fuseau horaire et les formats"</string>
     <string name="date_time_auto">"Automatique"</string>
@@ -207,7 +221,8 @@
     <string name="zone_list_menu_sort_alphabetically">"Trier par ordre alphabétique"</string>
     <string name="zone_list_menu_sort_by_timezone">"Trier par fuseau horaire"</string>
     <string name="security_settings_title">"Sécurité et localisation"</string>
-    <string name="security_settings_summary">"Définir Ma position, le déverrouillage de l\'écran et le blocage de la carte SIM"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"Mots de passe"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Activer Bluetooth"</string>
@@ -220,6 +235,8 @@
     <string name="bluetooth_error_title">"Attention"</string>
     <string name="bluetooth_pairing_error_message">"Un problème est survenu lors de l\'association à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message">"Un problème est survenu lors de l\'association à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, car le PIN saisi est incorrect."</string>
+    <string name="bluetooth_pairing_device_down_error_message">"Impossible d\'établir la communication avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message">"Association refusée par <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message">"Un problème est survenu lors de la connexion à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title">"Rechercher des appareils"</string>
     <string name="bluetooth_device_context_connect">"Se connecter"</string>
@@ -260,11 +277,15 @@
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <string name="wifi_security_wpa_eap">"WPA-EAP"</string>
+    <string name="wifi_security_ieee8021x">"IEEE8021X"</string>
     <string name="wifi_security_unknown">"Inconnu"</string>
-    <string name="wifi_security_verbose_open">"Ouvrir le réseau"</string>
-    <string name="wifi_security_verbose_wep">"Sécurisé avec une clé WEP"</string>
-    <string name="wifi_security_verbose_wpa">"Sécurisé par WPA"</string>
-    <string name="wifi_security_verbose_wpa2">"Sécurisé par WPA2"</string>
+    <string name="wifi_security_verbose_open">"réseau ouvert"</string>
+    <string name="wifi_security_verbose_wep">"sécurisé par clé WEP"</string>
+    <string name="wifi_security_verbose_wpa">"sécurisé par WPA"</string>
+    <string name="wifi_security_verbose_wpa2">"sécurisé par WPA2"</string>
+    <string name="wifi_security_verbose_wpa_eap">"sécurisé par WPA-EAP"</string>
+    <string name="wifi_security_verbose_ieee8021x">"sécurisé par IEEE 802.1x"</string>
     <string name="ip_address">"Adresse IP"</string>
     <string name="signal">"Intensité du signal"</string>
     <string name="wifi_starting">"Activation…"</string>
@@ -277,12 +298,19 @@
     <string name="error_saving">"Impossible d\'enregistrer le réseau"</string>
     <string name="connect">"Se connecter"</string>
     <string name="connect_to_blank">"Connexion à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="please_select_eap">"Méthode EAP"</string>
+    <string name="please_select_phase2">"Authentification phase 2"</string>
+    <string name="please_type_identity">"Identité"</string>
+    <string name="please_type_anonymous_identity">"Anonyme"</string>
+    <string name="please_select_client_certificate">"Certificat client"</string>
+    <string name="please_select_ca_certificate">"Certificat CA"</string>
+    <string name="please_type_private_key_passwd">"Mot de passe de clé privée"</string>
     <string name="please_type_passphrase">"Mot de passe sans fil"</string>
     <string name="please_type_hex_key">"Touche hex WEP (0-9, A-F)"</string>
     <string name="wifi_show_password">"Afficher le mot de passe"</string>
     <string name="scan_wifi">"Rechercher"</string>
     <string name="summary_not_in_range">"Hors de portée"</string>
-    <string name="summary_remembered">"Réseaux enregistrés"</string>
+    <string name="summary_remembered">"enregistré"</string>
     <string name="summary_connection_failed">"Échec de la connexion. Sélectionnez cette option pour réessayer."</string>
     <string name="wifi_access_points">"Réseaux Wi-Fi"</string>
     <string name="wifi_type_ssid">"SSID du réseau"</string>
@@ -316,7 +344,7 @@
     <string name="wifi_setting_sleep_policy_title">"Politique de veille Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary">"Indiquer quand basculer du Wi-Fi sur le réseau de données mobile"</string>
     <string name="wifi_setting_sleep_policy_error">"Un problème est survenu lors du paramétrage de la politique de veille."</string>
-    <string name="wifi_advanced_mac_address_title">"Adresses MAC"</string>
+    <string name="wifi_advanced_mac_address_title">"Adresse MAC"</string>
     <string name="fragment_status_scanning">"Recherche…"</string>
     <string name="fragment_status_connecting">"Connexion à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
     <string name="fragment_status_authenticating">"Authentification auprès de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
@@ -347,7 +375,7 @@
     <string name="vibrate_summary">"Activer le vibreur pour les appels entrants"</string>
     <string name="notification_sound_title">"Sonnerie de notification"</string>
     <string name="notification_sound_summary">"Définir votre sonnerie de notification par défaut"</string>
-    <string name="incoming_call_volume_title">"Volume de l\'appel entrant"</string>
+    <string name="incoming_call_volume_title">"Volume des appels entrants"</string>
     <string name="notification_volume_title">"Volume des notifications"</string>
     <string name="checkbox_notification_same_as_incoming_call">"Utiliser le volume des appels entrants pour les notifications"</string>
     <string name="notification_sound_dialog_title">"Sélectionner une sonnerie de notification"</string>
@@ -360,10 +388,13 @@
     <string name="sound_effects_enable_summary_on">"Jouer un son lors des sélections à l\'écran"</string>
     <string name="sound_effects_enable_summary_off">"Jouer un son lors des sélections à l\'écran"</string>
     <string name="play_media_notification_sounds_enable_title">"Notifications carte SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"Désactiver les notifications sonores de la carte SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"Activer les notifications sonores de la carte SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_on">"Émettre un son pour les notifications de la carte SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_off">"Émettre un son pour les notifications de la carte SD"</string>
     <string name="sync_settings">"Synchro. des données"</string>
     <string name="sync_settings_summary">"Sélectionner les applications à synchroniser"</string>
+    <string name="search_settings">"Recherche"</string>
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"Paramètres d\'affichage"</string>
     <string name="animations_title">"Animation"</string>
     <string name="animations_summary_on">"Animation lors de l\'ouverture et de la fermeture des fenêtres"</string>
@@ -403,14 +434,22 @@
     <string name="model_number">"Numéro du modèle"</string>
     <string name="baseband_version">"Version de bande de base"</string>
     <string name="kernel_version">"Version du noyau"</string>
-    <string name="build_number">"Numéro de version"</string>
+    <string name="build_number">"Numéro de build"</string>
     <string name="device_info_not_available">"Non disponible"</string>
     <string name="device_status_activity_title">"État"</string>
     <string name="device_status">"État"</string>
-    <string name="device_status_summary">"IIEM, numéro de téléphone, signal, etc."</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
     <string name="storage_settings_title">"Carte SD et mémoire"</string>
     <string name="storage_settings_summary">"Retirer la carte SD, afficher la mémoire disponible"</string>
-    <string name="status_number">"Numéro de téléphone"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"Type de réseau mobile"</string>
     <string name="status_data_state">"État du réseau mobile"</string>
     <string name="status_service_state">"État du service"</string>
@@ -464,12 +503,13 @@
     <string name="restore_default_apn_completed">"Réinitialisation des paramètres APN par défaut terminée"</string>
     <string name="master_clear_title">"Réinit. valeurs d\'usine"</string>
     <string name="master_clear_summary">"Effacer toutes les données du téléphone"</string>
-    <string name="master_clear_desc">"Cette action réinitialisera le téléphone à ses valeurs d\'usine et effacera toutes les données et applications téléchargées !"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
     <string name="master_clear_button_text">"Réinitialiser le téléphone"</string>
-    <string name="master_clear_final_desc">"Réinitialiser le téléphone et effacer toutes les données et applications ? Cette action ne peut être inversée."</string>
+    <string name="master_clear_final_desc">"Souhaitez-vous vraiment supprimer toutes vos informations personnelles et toutes les applications téléchargées ? Cette action ne peut pas être annulée."</string>
     <string name="master_clear_final_button_text">"Tout effacer"</string>
-    <string name="master_clear_gesture_prompt">"Saisissez votre motif de déverrouillage"</string>
-    <string name="master_clear_gesture_explanation">"Vous devez dessiner votre motif de déverrouillage pour confirmer la réinitialisation du téléphone."</string>
+    <string name="master_clear_gesture_prompt">"Saisissez votre schéma de déverrouillage"</string>
+    <string name="master_clear_gesture_explanation">"Vous devez dessiner votre schéma de déverrouillage pour confirmer la réinitialisation du téléphone."</string>
     <string name="master_clear_failed">"Les données n\'ont pas été réinitialisées car le service de nettoyage du système n\'est pas disponible."</string>
     <string name="media_format_title">"Formater la carte SD."</string>
     <string name="media_format_summary">"Permet d\'effacer toutes les données de la carte SD"</string>
@@ -480,16 +520,21 @@
     <string name="media_format_gesture_prompt">"Créez votre schéma de déverrouillage"</string>
     <string name="media_format_gesture_explanation">"Vous devez créer votre schéma de déverrouillage pour confirmer le format de la carte SD."</string>
     <string name="call_settings_title">"Paramètres d\'appel"</string>
-    <string name="call_settings_summary">"Configurer mess. vocale, transferts d\'appel, mises en attente, ID d\'appelant"</string>
+    <string name="call_settings_summary">"Configurer mess. vocale, transferts d\'appel, mises en attente, numéro de l\'appelant"</string>
     <string name="network_settings_title">"Réseaux mobiles"</string>
     <string name="network_settings_summary">"Définir les options d\'itinérance, réseaux, noms de points d\'accès"</string>
-    <string name="location_title">"Sources pour Ma position"</string>
+    <string name="location_title">"Ma position"</string>
     <string name="location_network_based">"Utiliser réseaux sans fil"</string>
     <string name="location_networks_disabled">"Afficher position dans les applications (comme Google Maps)"</string>
     <string name="location_neighborhood_level">"Position géographique déterminée par réseaux Wi-Fi et/ou mobile"</string>
     <string name="location_gps">"Activer les satellites GPS"</string>
     <string name="location_street_level">"Localisation précise au niveau de la rue lors du positionnement géographique (désélectionner pour économiser la batterie)"</string>
     <string name="location_gps_disabled">"Localiser au niveau rue (requiert + de batterie et une vue dégagée)"</string>
+    <string name="use_location_title">"Partager avec Google"</string>
+    <string name="use_location_summary">"Autoriser Google à utiliser vos informations de localisation pour améliorer l\'efficacité des recherches et des autres services Google"</string>
+    <string name="use_location_warning_message">"Autoriser Google à utiliser vos informations de localisation pour améliorer l\'efficacité des recherches et des autres services Google"</string>
+    <string name="agree">"Accepter"</string>
+    <string name="disagree">"Refuser"</string>
     <string name="about_settings">"À propos du téléphone"</string>
     <string name="about_settings_summary">"Informations légales, état du téléphone et version du logiciel"</string>
     <string name="legal_information">"Informations légales"</string>
@@ -497,42 +542,42 @@
     <string name="copyright_title">"Copyright"</string>
     <string name="license_title">"Licence"</string>
     <string name="terms_title">"Conditions d\'utilisation"</string>
-    <string name="system_tutorial_list_item_title">"Didacticiel relatif au système"</string>
+    <string name="system_tutorial_list_item_title">"Didacticiel système"</string>
     <string name="system_tutorial_list_item_summary">"Comment utiliser votre téléphone ?"</string>
     <string name="settings_license_activity_title">"Licences open source"</string>
     <string name="settings_license_activity_unavailable">"Un problème est survenu lors du chargement des licences."</string>
     <string name="settings_license_activity_loading">"Chargement..."</string>
-    <string name="lock_settings_title">"Motif de déverrouillage de l\'écran"</string>
-    <string name="lockpattern_change_lock_pattern_label">"Modifier le motif de déverrouillage"</string>
-    <string name="lockpattern_need_to_unlock">"Confirmer le motif enregistré"</string>
+    <string name="lock_settings_title">"Schéma de déverrouillage de l\'écran"</string>
+    <string name="lockpattern_change_lock_pattern_label">"Modifier le schéma de déverrouillage"</string>
+    <string name="lockpattern_need_to_unlock">"Confirmer le schéma enregistré"</string>
     <string name="lockpattern_need_to_unlock_wrong">"Désolé. Merci de réessayer :"</string>
-    <string name="lockpattern_recording_intro_header">"Dessiner un motif de déverrouillage :"</string>
+    <string name="lockpattern_recording_intro_header">"Dessiner un schéma de déverrouillage :"</string>
     <string name="lockpattern_recording_intro_footer">"Appuyer sur Menu pour obtenir de l\'aide."</string>
     <string name="lockpattern_recording_inprogress">"Ôtez le doigt lorsque vous avez terminé."</string>
     <string name="lockpattern_recording_incorrect_too_short">"Reliez au moins <xliff:g id="NUMBER">%d</xliff:g> points. Veuillez réessayer :"</string>
-    <string name="lockpattern_pattern_entered_header">"Motif enregistré !"</string>
-    <string name="lockpattern_need_to_confirm">"Redessinez le motif pour confirmer :"</string>
-    <string name="lockpattern_pattern_confirmed_header">"Votre nouveau motif de déverrouillage :"</string>
+    <string name="lockpattern_pattern_entered_header">"Schéma enregistré !"</string>
+    <string name="lockpattern_need_to_confirm">"Redessinez le schéma pour confirmer :"</string>
+    <string name="lockpattern_pattern_confirmed_header">"Votre nouveau schéma de déverrouillage :"</string>
     <string name="lockpattern_confirm_button_text">"Confirmer"</string>
     <string name="lockpattern_restart_button_text">"Redessiner"</string>
     <string name="lockpattern_retry_button_text">"Réessayer"</string>
     <string name="lockpattern_continue_button_text">"Continuer"</string>
-    <string name="lockpattern_settings_title">"Motif de déverrouillage"</string>
-    <string name="lockpattern_settings_enable_title">"Demander un motif"</string>
-    <string name="lockpattern_settings_enable_summary">"Vous devez dessiner le motif pour déverrouiller l\'écran."</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title">"Utiliser un motif visible"</string>
+    <string name="lockpattern_settings_title">"Schéma de déverrouillage"</string>
+    <string name="lockpattern_settings_enable_title">"Demander un schéma"</string>
+    <string name="lockpattern_settings_enable_summary">"Vous devez dessiner le schéma pour déverrouiller l\'écran."</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">"Utiliser un schéma visible"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title">"Commentaires tactiles"</string>
-    <string name="lockpattern_settings_choose_lock_pattern">"Créer un motif de déverrouillage"</string>
-    <string name="lockpattern_settings_change_lock_pattern">"Modifier le motif de déverrouillage"</string>
-    <string name="lockpattern_settings_help_how_to_record">"Comment dessiner un motif de déverrouillage :"</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"Créer un schéma de déverrouillage"</string>
+    <string name="lockpattern_settings_change_lock_pattern">"Modifier le schéma de déverrouillage"</string>
+    <string name="lockpattern_settings_help_how_to_record">"Comment dessiner un schéma de déverrouillage :"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Trop de tentatives échouées !"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Réessayer dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
     <string name="skip_button_label">"Annuler"</string>
     <string name="next_button_label">"Suivant"</string>
     <string name="lock_title">"Sécurisation de votre téléphone"</string>
-    <string name="lock_intro_message"><font size="17">"Protégez votre téléphone contre toute utilisation non autorisée en créant un motif 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 motif. "\n<font height="17">\n</font><b>"2"</b>" Lorsque vous êtes prêt, dessinez votre propre motif de déverrouillage. Essayez différents motifs, mais reliez au moins quatre points."\n<font height="17">\n</font>"Reproduisez votre motif pour confirmer."\n<font height="17">\n</font><b>"Pour commencer, sélectionnez \"Suivant\"."</b>\n<font height="3">\n</font>"Si vous ne souhaitez pas activer cette protection, sélectionnez \"Annuler\"."</font></string>
-    <string name="lock_example_title">"Exemple de motif"</string>
-    <string name="lock_example_message">"Reliez au moins quatre points."\n" "\n"Sélectionnez \"Suivant\" lorsque vous voulez créer votre propre motif."</string>
+    <string name="lock_intro_message"><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 différents schémas, mais reliez au moins quatre points."\n<font height="17">\n</font><b></b>"Reproduisez votre schéma pour confirmer."\n<font height="17">\n</font><b>"Pour commencer, sélectionnez \"Suivant\"."</b>\n<font height="3">\n</font>"Si vous ne souhaitez pas activer cette protection, sélectionnez \"Annuler\"."</font></string>
+    <string name="lock_example_title">"Exemple de schéma"</string>
+    <string name="lock_example_message">"Reliez au moins quatre points."\n" "\n"Sélectionnez \"Suivant\" pour créer votre propre schéma."</string>
     <string name="manageapplications_settings_title">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary">"Gérer et supprimer les applications installées"</string>
     <string name="applications_settings">"Applications"</string>
@@ -555,6 +600,7 @@
     <string name="data_size_label">"Données"</string>
     <string name="uninstall_text">"Désinstaller"</string>
     <string name="clear_user_data_text">"Effacer les données"</string>
+    <string name="app_factory_reset">"Désinstaller les mises à jour"</string>
     <string name="auto_launch_enable_text">"Vous avez choisi de lancer cette application par défaut pour certaines actions."</string>
     <string name="auto_launch_disable_text">"Aucun paramètre par défaut défini."</string>
     <string name="clear_activities">"Effacer les actions par défaut"</string>
@@ -576,10 +622,15 @@
     <string name="app_not_found_dlg_title">"L\'application n\'a pas été trouvée."</string>
     <string name="app_not_found_dlg_text">"L\'application n\'a pas été trouvée dans la liste des applications installées."</string>
     <string name="clear_data_failed">"Impossible d\'effacer les données de l\'application."</string>
+    <string name="app_factory_reset_dlg_title">"Désinstaller les mises à jour"</string>
+    <string name="app_factory_reset_dlg_text">"Souhaitez-vous désinstaller toutes les mises à jour de cette application système Android ?"</string>
+    <string name="clear_failed_dlg_title">"Effacer les données"</string>
+    <string name="clear_failed_dlg_text">"Échec de la suppression des données pour l\'application"</string>
     <string name="security_settings_desc">"Cette application peut accéder aux applications suivantes de votre téléphone :"</string>
     <string name="computing_size">"Traitement..."</string>
     <string name="invalid_size_value">"Impossible de calculer la taille du paquet."</string>
     <string name="empty_list_msg">"Aucune application tierce n\'est installée sur votre téléphone."</string>
+    <string name="version_text">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="language_settings">"Par. régionaux et texte"</string>
     <string name="language_settings_summary">"Définir la langue et la région, la saisie de texte et la correction automatique"</string>
     <string name="language_category">"Paramètres régionaux"</string>
@@ -588,7 +639,7 @@
     <string name="phone_language_summary">"Sélectionner la langue et le pays"</string>
     <string name="auto_replace">"Remplacement auto"</string>
     <string name="auto_replace_summary">"Corriger les mots mal saisis"</string>
-    <string name="auto_caps">"Majuscules automatiques"</string>
+    <string name="auto_caps">"Majuscules auto"</string>
     <string name="auto_caps_summary">"Mettre une majuscule en début de phrase"</string>
     <string name="auto_punctuate">"Ponctuation automatique"</string>
     <string name="hardkeyboard_category">"Paramètres du clavier physique"</string>
@@ -634,6 +685,8 @@
     <string name="keep_screen_on_summary">"L\'écran ne se met jamais en veille lors du chargement"</string>
     <string name="allow_mock_location">"Positions fictives"</string>
     <string name="allow_mock_location_summary">"Autoriser les positions fictives"</string>
+    <string name="adb_warning_title">"Activer le débogage USB ?"</string>
+    <string name="adb_warning_message">"Le débogage USB est conçu à des fins de développement uniquement. Il peut servir à copier des données entre votre ordinateur et votre appareil, à installer des applications sur votre appareil sans notification et à lire les données de journal."</string>
     <string name="gadget_picker_title">"Choisir un gadget"</string>
     <string name="widget_picker_title">"Choisir un widget"</string>
     <string name="battery_history_details_for">"Détails de l\'UID %d"</string>
@@ -647,10 +700,10 @@
     <string name="battery_history_system_time">"Heure système :"</string>
     <string name="battery_history_total_time">"Temps total :"</string>
     <string name="battery_history_starts">"Démarrages : <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> jours, <xliff:g id="HOURS">%2$d</xliff:g> heures, <xliff:g id="MINUTES">%3$d</xliff:g> minutes, <xliff:g id="SECONDS">%4$d</xliff:g> secondes"</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> heures, <xliff:g id="MINUTES">%2$d</xliff:g> minutes, <xliff:g id="SECONDS">%3$d</xliff:g> secondes"</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> minutes, <xliff:g id="SECONDS">%2$d</xliff:g> secondes"</string>
-    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> secondes"</string>
+    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> j <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> mn <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
+    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> mn <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
+    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> mn <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
+    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
     <string name="battery_history_packages_sharing_this_uid">"Paquets partageant cet UID :"</string>
     <string name="battery_history_no_data">"Aucune donnée sur l\'utilisation de la batterie disponible"</string>
     <string name="battery_history_sensor">"Capteur :"</string>
@@ -672,4 +725,277 @@
     <string name="app_name_label">"Application"</string>
     <string name="launch_count_label">"Nombre"</string>
     <string name="usage_time_label">"Temps d\'utilisation"</string>
+    <string name="accessibility_settings_title">"Accessibilité"</string>
+    <string name="accessibility_settings_summary">"Gérer les options d\'accessibilité"</string>
+    <string name="toggle_accessibility_title">"Accessibilité"</string>
+    <string name="accessibility_services_category">"Services d\'accessibilité"</string>
+    <string name="no_accessibility_services_summary">"Aucun service d\'accessibilité installé"</string>
+    <string name="accessibility_service_security_warning">"Il est possible que ce service d\'accessibilité puisse recueillir tout le texte que vous saisissez, y compris les données personnelles et les numéros de cartes de crédit, mais pas les mots de passe. Il est également possible qu\'il enregistre vos interactions avec l\'interface utilisateur. Il provient de l\'application <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Activer ce service d\'accessibilité ?"</string>
+    <string name="accessibility_service_disable_warning">"Désactiver les services d\'accessibilité ?"</string>
+    <string name="power_usage_summary_title">"Utilisation de la batterie"</string>
+    <string name="power_usage_summary">"Répartition·de·l\'utilisation·de·la·batterie"</string>
+    <string name="battery_since_unplugged">"Utilisation de la batterie depuis le débranchement"</string>
+    <string name="battery_since_reset">"Utilisation de la batterie depuis la dernière réinitialisation"</string>
+    <string name="battery_stats_duration">"Débranché depuis <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="awake">"Durée de fonctionnement de l\'appareil"</string>
+    <string name="wifi_on_time">"Temps de fonctionnement du Wi-Fi"</string>
+    <string name="bluetooth_on_time">"Temps de fonctionnement du Wi-Fi"</string>
+    <string name="usage_name_percent">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="PERCENT">%2$s</xliff:g> %%"</string>
+    <string name="details_title">"Infos détaillées sur l\'utilisation de la batterie"</string>
+    <string name="details_subtitle">"Détails d\'utilisation"</string>
+    <string name="controls_subtitle">"Ajuster la consommation"</string>
+    <string name="packages_subtitle">"Modules inclus"</string>
+    <string name="power_screen">"Écran"</string>
+    <string name="power_wifi">"Wi-Fi"</string>
+    <string name="power_bluetooth">"Bluetooth"</string>
+    <string name="power_cell">"Veille GSM"</string>
+    <string name="power_phone">"Appels vocaux"</string>
+    <string name="power_idle">"Téléphone inactif"</string>
+    <string name="usage_type_cpu">"Durée d\'utilisation totale de l\'UC"</string>
+    <string name="usage_type_cpu_foreground">"UC - Premier plan"</string>
+    <string name="usage_type_gps">"GPS"</string>
+    <string name="usage_type_phone">"Téléphone"</string>
+    <string name="usage_type_data_send">"Données envoyées"</string>
+    <string name="usage_type_data_recv">"Données reçues"</string>
+    <string name="usage_type_audio">"Audio"</string>
+    <string name="usage_type_video">"Vidéo"</string>
+    <string name="usage_type_on_time">"Durée de fonctionnement"</string>
+    <string name="battery_action_stop">"Forcer l\'arrêt"</string>
+    <string name="battery_action_app_details">"Informations sur l\'application"</string>
+    <string name="battery_action_app_settings">"Paramètres des applications"</string>
+    <string name="battery_action_display">"Paramètres d\'affichage"</string>
+    <string name="battery_action_wifi">"Paramètres Wi-Fi"</string>
+    <string name="battery_action_bluetooth">"Paramètres Bluetooth"</string>
+    <string name="battery_desc_voice">"Batterie utilisée par les appels vocaux"</string>
+    <string name="battery_desc_standby">"Batterie utilisée lorsque le téléphone est inactif"</string>
+    <string name="battery_desc_radio">"Batterie utilisée par le signal radio cellulaire"</string>
+    <string name="battery_sugg_radio">"Passez en mode Avion pour économiser la batterie dans les zones sans couverture cellulaire."</string>
+    <string name="battery_desc_display">"Batterie utilisée par l\'affichage et le rétro-éclairage"</string>
+    <string name="battery_sugg_display">"Réduire la luminosité et/ou le délai de mise en veille de l\'écran"</string>
+    <string name="battery_desc_wifi">"Batterie utilisée par le Wi-Fi"</string>
+    <string name="battery_sugg_wifi">"Désactiver la fonctionnalité Wi-Fi lorsque vous ne l\'utilisez pas ou lorsqu\'elle n\'est pas disponible"</string>
+    <string name="battery_desc_bluetooth">"Batterie utilisée par Bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic">"Désactiver Bluetooth lorsque vous ne l\'utilisez pas"</string>
+    <string name="battery_sugg_bluetooth_headset">"Essayez·de·vous·connecter·à·un·autre·appareil·Bluetooth"</string>
+    <string name="battery_desc_apps">"Batterie utilisée par les applications en cours d\'exécution"</string>
+    <string name="battery_sugg_apps_info">"Arrêter ou désinstaller l\'application"</string>
+    <string name="battery_sugg_apps_gps">"Désactivez le GPS lorsque vous ne l\'utilisez pas."</string>
+    <string name="battery_sugg_apps_settings">"L\'application dispose peut-être de paramètres permettant de réduire l\'utilisation de la batterie."</string>
+    <string name="menu_stats_unplugged">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_last_unplugged">"Depuis le dernier débranchement (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
+    <string name="menu_stats_total">"Utilisation totale"</string>
+    <string name="menu_stats_refresh">"Actualiser"</string>
+    <string name="process_kernel_label">"Système d\'exploitation Android"</string>
+    <string name="process_mediaserver_label">"Serveur multimédia"</string>
+    <string name="tts_settings">"Synthèse vocale"</string>
+    <string name="tts_settings_summary">"Définir les options de synthèse vocale"</string>
+    <string name="tts_settings_title">"Contrôles du synthétiseur vocal"</string>
+    <string name="use_default_tts_settings_title">"Toujours utiliser mes paramètres"</string>
+    <string name="use_default_tts_settings_summary">"Les paramètres par défaut ci-dessous remplacent les paramètres de l\'application."</string>
+    <string name="tts_default_settings_section">"Paramètres par défaut"</string>
+    <string name="tts_default_rate_title">"Cadence"</string>
+    <string name="tts_default_rate_summary">"Vitesse à laquelle le texte est énoncé"</string>
+    <string name="tts_default_pitch_title">"Ton"</string>
+    <string name="tts_default_pitch_summary">"Affecte le ton utilisé par la synthèse vocale"</string>
+    <string name="tts_default_lang_title">"Langue"</string>
+    <string name="tts_default_lang_summary">"Définit la langue utilisée par la syntèse vocale"</string>
+    <string name="tts_play_example_title">"Écouter un échantillon"</string>
+    <string name="tts_play_example_summary">"Lire une courte démonstration de la synthèse vocale"</string>
+    <string name="tts_install_data_title">"Installer les données vocales"</string>
+    <string name="tts_install_data_summary">"Installer les données nécessaires à la synthèse vocale"</string>
+    <string name="tts_data_installed_summary">"Les données nécessaires à la synthèse vocale sont déjà correctement installées."</string>
+    <string name="tts_demo">"Voici un échantillon de synthèse vocale."</string>
+    <string name="tts_settings_changed_demo">"Vos paramètres ont été modifiés. Voici un échantillon illustrant les nouveaux paramètres."</string>
+    <string name="gadget_title">"Contrôle de l\'alimentation"</string>
+    <string name="vpn_settings_activity_title">"Paramètres de VPN"</string>
+    <string name="vpn_connect_to">"Se connecter à %s"</string>
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <string name="vpn_password_colon">"Mot de passe :"</string>
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <string name="vpn_connect_button">"Se connecter"</string>
+    <string name="vpn_yes_button">"Oui"</string>
+    <string name="vpn_no_button">"Non"</string>
+    <string name="vpn_back_button">"Retour"</string>
+    <string name="vpn_mistake_button">"Non, il s\'agit d\'une erreur."</string>
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <string name="vpn_connecting">"Connexion en cours…"</string>
+    <string name="vpn_disconnecting">"Déconnexion en cours…"</string>
+    <string name="vpn_connected">"Connecté"</string>
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <string name="vpn_profile_added">"Ajout de %s"</string>
+    <string name="vpn_profile_replaced">"Modifications appliquées à %s"</string>
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 74b1d4c..62a1732 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -32,18 +32,44 @@
     <item>"10 minuti"</item>
     <item>"Mai timeout"</item>
   </string-array>
+  <string-array name="tts_rate_entries">
+    <item>"Molto lenta"</item>
+    <item>"Lenta"</item>
+    <item>"Normale"</item>
+    <item>"Veloce"</item>
+    <item>"Molto veloce"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item>"Molto basso"</item>
+    <item>"Basso"</item>
+    <item>"Normale"</item>
+    <item>"Alto"</item>
+    <item>"Molto alto"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item>"Inglese americano"</item>
+    <item>"Inglese britannico"</item>
+    <item>"Francese"</item>
+    <item>"Tedesco"</item>
+    <item>"Italiano"</item>
+    <item>"Spagnolo"</item>
+  </string-array>
   <string-array name="wifi_security_entries">
     <item>"Automatico"</item>
     <item>"Nessuna"</item>
     <item>"WEP"</item>
     <item>"WPA Personal"</item>
     <item>"WPA2 Personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item>"Nessuna"</item>
     <item>"WEP"</item>
     <item>"WPA Personal"</item>
     <item>"WPA2 Personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item>"Automatico"</item>
@@ -73,4 +99,19 @@
     <item>"Conteggio avvii"</item>
     <item>"Nome applicazione"</item>
   </string-array>
+  <string-array name="wifi_eap_entries">
+    <item>"PEAP"</item>
+    <item>"TLS"</item>
+    <item>"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item>"Nessuna"</item>
+    <item>"PAP"</item>
+    <item>"MSCHAP"</item>
+    <item>"MSCHAP2"</item>
+    <item>"GTC"</item>
+  </string-array>
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 24a7972..c44159f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -107,7 +107,10 @@
     <string name="date_and_time">"Impostazioni data e ora"</string>
     <string name="date_time_12_hour_sample">"1:00 pm"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Modifica ora"</string>
+    <string name="date_time_changeDate_text">"Data"</string>
     <string name="choose_timezone">"Seleziona fuso orario"</string>
+    <string name="normal_date_format">"Normale (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label">"Anteprima:"</string>
     <string name="display_font_size_label">"Dimensioni carattere:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -188,12 +191,23 @@
     <string name="proxy_settings_label">"Impostazioni proxy"</string>
     <string name="cancel">"Annulla"</string>
     <string name="settings_label">"Impostazioni"</string>
+    <string name="settings_shortcut">"Impostazioni"</string>
     <string name="airplane_mode">"Modalità aereo"</string>
     <string name="airplane_mode_summary">"Disattiva tutte le connessioni wireless"</string>
     <string name="airplane_mode_turning_on">"Disattivazione connessioni wireless..."</string>
     <string name="airplane_mode_turning_off">"Attivazione connessioni wireless..."</string>
     <string name="radio_controls_title">"Controlli wireless"</string>
-    <string name="radio_controls_summary">"Gestisci Wi-Fi, Bluetooth, modalità aereo e reti mobili"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <string name="roaming">"Roaming dati"</string>
+    <string name="roaming_enable">"Connessione a servizi di dati in roaming"</string>
+    <string name="roaming_disable">"Connessione a servizi di dati in roaming"</string>
+    <string name="roaming_reenable_message">"Connettività dati persa: hai lasciato la rete del tuo operatore con il roaming dati disattivato."</string>
+    <string name="roaming_turn_it_on_button">"Attiva"</string>
+    <string name="roaming_warning">"Consentire il roaming dati? I costi potrebbero essere elevati."</string>
+    <string name="roaming_reenable_title">"Attenzione"</string>
+    <string name="networks">"Selezione operatore"</string>
+    <string name="sum_carrier_select">"Seleziona un operatore di rete"</string>
     <string name="date_and_time_settings_title">"Data e ora"</string>
     <string name="date_and_time_settings_summary">"Imposta data, ora, fuso orario e formati"</string>
     <string name="date_time_auto">"Automatiche"</string>
@@ -207,7 +221,8 @@
     <string name="zone_list_menu_sort_alphabetically">"Ordine alfabetico"</string>
     <string name="zone_list_menu_sort_by_timezone">"Ordina per fuso orario"</string>
     <string name="security_settings_title">"Protezione e posizione"</string>
-    <string name="security_settings_summary">"Imposta posizione, sblocco schermo, blocco della SIM"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"Password"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Attiva Bluetooth"</string>
@@ -220,6 +235,8 @@
     <string name="bluetooth_error_title">"Attenzione"</string>
     <string name="bluetooth_pairing_error_message">"Errore durante l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message">"Errore durante l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Il PIN digitato è errato."</string>
+    <string name="bluetooth_pairing_device_down_error_message">"Impossibile stabilire la comunicazione con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message">"Accoppiamento rifiutato da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message">"Errore durante la connessione a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title">"Cerca dispositivi"</string>
     <string name="bluetooth_device_context_connect">"Connetti"</string>
@@ -260,11 +277,15 @@
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <string name="wifi_security_wpa_eap">"WPA-EAP"</string>
+    <string name="wifi_security_ieee8021x">"IEEE8021X"</string>
     <string name="wifi_security_unknown">"Sconosciuta"</string>
-    <string name="wifi_security_verbose_open">"Rete aperta"</string>
-    <string name="wifi_security_verbose_wep">"Protetta con WEP"</string>
-    <string name="wifi_security_verbose_wpa">"Protetta con WPA"</string>
-    <string name="wifi_security_verbose_wpa2">"Protetta con WPA2"</string>
+    <string name="wifi_security_verbose_open">"rete aperta"</string>
+    <string name="wifi_security_verbose_wep">"protetta con WEP"</string>
+    <string name="wifi_security_verbose_wpa">"protetta con WPA"</string>
+    <string name="wifi_security_verbose_wpa2">"protetta con WPA2"</string>
+    <string name="wifi_security_verbose_wpa_eap">"protetta con WPA-EAP"</string>
+    <string name="wifi_security_verbose_ieee8021x">"protetta con IEEE 802.1x"</string>
     <string name="ip_address">"Indirizzo IP"</string>
     <string name="signal">"Intensità segnale"</string>
     <string name="wifi_starting">"Attivazione..."</string>
@@ -277,12 +298,19 @@
     <string name="error_saving">"Impossibile salvare la rete"</string>
     <string name="connect">"Connetti"</string>
     <string name="connect_to_blank">"Connessione a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="please_select_eap">"Metodo EAP"</string>
+    <string name="please_select_phase2">"Autenticazione fase 2"</string>
+    <string name="please_type_identity">"Identità"</string>
+    <string name="please_type_anonymous_identity">"Identità anonima"</string>
+    <string name="please_select_client_certificate">"Certificato client"</string>
+    <string name="please_select_ca_certificate">"Certificato CA"</string>
+    <string name="please_type_private_key_passwd">"Password chiave privata"</string>
     <string name="please_type_passphrase">"Password wireless"</string>
     <string name="please_type_hex_key">"Chiave esadecimale WEP (0-9, A-F)"</string>
     <string name="wifi_show_password">"Mostra password."</string>
     <string name="scan_wifi">"Scansione"</string>
     <string name="summary_not_in_range">"Fuori portata"</string>
-    <string name="summary_remembered">"Memorizzata"</string>
+    <string name="summary_remembered">"memorizzata"</string>
     <string name="summary_connection_failed">"Connessione non riuscita. Seleziona per riprovare"</string>
     <string name="wifi_access_points">"Reti Wi-Fi"</string>
     <string name="wifi_type_ssid">"SSID rete"</string>
@@ -360,17 +388,20 @@
     <string name="sound_effects_enable_summary_on">"Riproduci toni durante una selezione sullo schermo"</string>
     <string name="sound_effects_enable_summary_off">"Riproduci toni durante una selezione sullo schermo"</string>
     <string name="play_media_notification_sounds_enable_title">"Notifiche scheda SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"Disattiva i suoni di notifica della scheda SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"Attiva suoni di notifica della scheda SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_on">"Riproduci suono per notifiche scheda SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_off">"Riproduci suono per notifiche scheda SD"</string>
     <string name="sync_settings">"Sincronizzazione dati"</string>
     <string name="sync_settings_summary">"Seleziona le applicazioni da sincronizzare"</string>
+    <string name="search_settings">"Ricerca"</string>
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"Impostazioni display"</string>
     <string name="animations_title">"Animazione"</string>
     <string name="animations_summary_on">"Mostra l\'animazione durante l\'apertura e la chiusura di finestre"</string>
     <string name="animations_summary_off">"Mostra l\'animazione durante l\'apertura e la chiusura di finestre"</string>
     <string name="accelerometer_title">"Orientamento"</string>
-    <string name="accelerometer_summary_on">"Cambia automaticamente l\'orientamento quando il cellulare viene ruotato"</string>
-    <string name="accelerometer_summary_off">"Cambia automaticamente l\'orientamento quando il cellulare viene ruotato"</string>
+    <string name="accelerometer_summary_on">"Cambia automaticamente quando il cellulare viene ruotato"</string>
+    <string name="accelerometer_summary_off">"Cambia automatic. l\'orientamento quando il cell. viene ruotato"</string>
     <string name="brightness">"Luminosità"</string>
     <string name="brightness_summary">"Regola la luminosità dello schermo"</string>
     <string name="screen_timeout">"Timeout schermo"</string>
@@ -407,10 +438,18 @@
     <string name="device_info_not_available">"Non disponibile"</string>
     <string name="device_status_activity_title">"Stato"</string>
     <string name="device_status">"Stato"</string>
-    <string name="device_status_summary">"IMEI, numero di telefono, segnale ecc."</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
     <string name="storage_settings_title">"Scheda SD e memoria"</string>
     <string name="storage_settings_summary">"Smonta la scheda SD, visualizza spazio di archiviazione disponibile"</string>
-    <string name="status_number">"Numero di telefono"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"Tipo di rete cellulare"</string>
     <string name="status_data_state">"Stato rete cellulare"</string>
     <string name="status_service_state">"Stato servizio"</string>
@@ -464,9 +503,10 @@
     <string name="restore_default_apn_completed">"Ripristino delle impostazioni APN predefinite completato"</string>
     <string name="master_clear_title">"Ripristino dati di fabbrica"</string>
     <string name="master_clear_summary">"Cancella tutti i dati sul telefono"</string>
-    <string name="master_clear_desc">"Questa azione consente di ripristinare i valori di fabbrica del telefono, cancellando tutti i dati e le applicazioni scaricate."</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
     <string name="master_clear_button_text">"Ripristina telefono"</string>
-    <string name="master_clear_final_desc">"Ripristinare il telefono, cancellando tutti i dati e le applicazioni? Questa azione è irreversibile."</string>
+    <string name="master_clear_final_desc">"Cancellare tutte le tue informazioni personali e qualsiasi applicazione scaricata? Sarà impossibile annullare questa azione."</string>
     <string name="master_clear_final_button_text">"Cancella tutto"</string>
     <string name="master_clear_gesture_prompt">"Inserisci la sequenza di sblocco"</string>
     <string name="master_clear_gesture_explanation">"Per confermare un ripristino del telefono occorre inserire la sequenza di sblocco."</string>
@@ -483,13 +523,18 @@
     <string name="call_settings_summary">"Imposta segreteria, deviazione chiamate, avviso di chiamata, ID chiamante"</string>
     <string name="network_settings_title">"Reti mobili"</string>
     <string name="network_settings_summary">"Imposta le opzioni per roaming, reti e APN"</string>
-    <string name="location_title">"Fonti localizzazione personali"</string>
+    <string name="location_title">"La mia posizione"</string>
     <string name="location_network_based">"Usa reti wireless"</string>
     <string name="location_networks_disabled">"Visualizza la posizione nelle applicazioni (ad esempio Maps) utilizzando le reti wireless"</string>
     <string name="location_neighborhood_level">"Posizione determinata dalle reti mobili e/o Wi-Fi"</string>
     <string name="location_gps">"Attiva satelliti GPS"</string>
     <string name="location_street_level">"Accuratezza a livello stradale (deseleziona per risparmiare batteria)"</string>
     <string name="location_gps_disabled">"Localizza a livello stradale (richiede più batteria e la vista del cielo)"</string>
+    <string name="use_location_title">"Condividi con Google"</string>
+    <string name="use_location_summary">"Consenti a Google di utilizzare la posizione per migliorare la ricerca e altri servizi"</string>
+    <string name="use_location_warning_message">"Consenti a Google di utilizzare la posizione per migliorare i tuoi risultati di ricerca e altri servizi"</string>
+    <string name="agree">"Accetto"</string>
+    <string name="disagree">"Non accetto"</string>
     <string name="about_settings">"Info sul telefono"</string>
     <string name="about_settings_summary">"Visualizza informazioni legali, stato del telefono, versione del software"</string>
     <string name="legal_information">"Informazioni legali"</string>
@@ -497,7 +542,7 @@
     <string name="copyright_title">"Copyright"</string>
     <string name="license_title">"Licenza"</string>
     <string name="terms_title">"Termini e condizioni"</string>
-    <string name="system_tutorial_list_item_title">"Esercitazione sul sistema"</string>
+    <string name="system_tutorial_list_item_title">"Esercitazione sistema"</string>
     <string name="system_tutorial_list_item_summary">"Impara a utilizzare il tuo cellulare"</string>
     <string name="settings_license_activity_title">"Licenze open source"</string>
     <string name="settings_license_activity_unavailable">"Errore durante il caricamento delle licenze."</string>
@@ -555,6 +600,7 @@
     <string name="data_size_label">"Dati"</string>
     <string name="uninstall_text">"Disinstalla"</string>
     <string name="clear_user_data_text">"Cancella dati"</string>
+    <string name="app_factory_reset">"Disinstalla aggiornamenti"</string>
     <string name="auto_launch_enable_text">"Hai scelto di avviare per impostazione predefinita questa applicazione per alcune azioni."</string>
     <string name="auto_launch_disable_text">"Nessuna applicazione predefinita impostata."</string>
     <string name="clear_activities">"Cancella predefinite"</string>
@@ -576,10 +622,15 @@
     <string name="app_not_found_dlg_title">"Applicazione non trovata"</string>
     <string name="app_not_found_dlg_text">"Impossibile trovare l\'applicazione \nnell\'elenco di applicazioni installate."</string>
     <string name="clear_data_failed">"Impossibile cancellare i dati dell\'applicazione."</string>
+    <string name="app_factory_reset_dlg_title">"Disinstalla aggiornamenti"</string>
+    <string name="app_factory_reset_dlg_text">"Disinstallare tutti gli aggiornamenti di questa applicazione di sistema Android?"</string>
+    <string name="clear_failed_dlg_title">"Cancella dati"</string>
+    <string name="clear_failed_dlg_text">"Cancellazione dati per applicazione non riuscita"</string>
     <string name="security_settings_desc">"Contenuti a cui può accedere l\'applicazione sul telefono:"</string>
     <string name="computing_size">"Elaborazione..."</string>
     <string name="invalid_size_value">"Impossibile stabilire le dimensioni del pacchetto"</string>
     <string name="empty_list_msg">"Nessuna applicazione di terze parti installata."</string>
+    <string name="version_text">"versione <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="language_settings">"Lingua e testo"</string>
     <string name="language_settings_summary">"Impostazioni internazionali (lingua e regione), di inserimento e correzione automatica del testo"</string>
     <string name="language_category">"Impostazioni lingua"</string>
@@ -634,6 +685,8 @@
     <string name="keep_screen_on_summary">"Lo schermo non va mai in stand-by se sotto carica"</string>
     <string name="allow_mock_location">"Posizioni fittizie"</string>
     <string name="allow_mock_location_summary">"Consenti posizioni fittizie"</string>
+    <string name="adb_warning_title">"Attivare debug USB?"</string>
+    <string name="adb_warning_message">"Il debug USB è solo a scopo di sviluppo. Può servire per copiare dati tra il computer e il dispositivo, per installare applicazioni sul tuo dispositivo senza notifica e per leggere i dati dei log."</string>
     <string name="gadget_picker_title">"Scegli gadget"</string>
     <string name="widget_picker_title">"Scegli widget"</string>
     <string name="battery_history_details_for">"Dettagli per UID %d"</string>
@@ -647,10 +700,10 @@
     <string name="battery_history_system_time">"Tempo sistema:"</string>
     <string name="battery_history_total_time">"Tempo totale:"</string>
     <string name="battery_history_starts">"Avvii: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> giorni, <xliff:g id="HOURS">%2$d</xliff:g> ore, <xliff:g id="MINUTES">%3$d</xliff:g> minuti, <xliff:g id="SECONDS">%4$d</xliff:g> secondi"</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> ore, <xliff:g id="MINUTES">%2$d</xliff:g> minuti, <xliff:g id="SECONDS">%3$d</xliff:g> secondi"</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> minuti, <xliff:g id="SECONDS">%2$d</xliff:g> secondi"</string>
-    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> secondi"</string>
+    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> g <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>
+    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
+    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
+    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
     <string name="battery_history_packages_sharing_this_uid">"Pacchetti che condividono questo UID:"</string>
     <string name="battery_history_no_data">"Dati sull\'utilizzo della batteria non disponibili"</string>
     <string name="battery_history_sensor">"Sensore:"</string>
@@ -672,4 +725,277 @@
     <string name="app_name_label">"Applicazione"</string>
     <string name="launch_count_label">"Conteggio"</string>
     <string name="usage_time_label">"Tempo di utilizzo"</string>
+    <string name="accessibility_settings_title">"Accesso facilitato"</string>
+    <string name="accessibility_settings_summary">"Gestisci opzioni di accesso facilitato"</string>
+    <string name="toggle_accessibility_title">"Accesso facilitato"</string>
+    <string name="accessibility_services_category">"Servizi di accesso facilitato"</string>
+    <string name="no_accessibility_services_summary">"Nessun servizio di accesso facilitato installato."</string>
+    <string name="accessibility_service_security_warning">"Questo servizio di accesso facilitato potrebbe riuscire a raccogliere tutto il testo digitato, compresi i numeri di carte di credito ma eccetto le password. Potrebbe anche registrare le tue interazioni con l\'interfaccia utente. Deriva dall\'applicazione <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Attivare questo servizio di accesso facilitato?"</string>
+    <string name="accessibility_service_disable_warning">"Disattivare accesso facilitato?"</string>
+    <string name="power_usage_summary_title">"Utilizzo batteria"</string>
+    <string name="power_usage_summary">"Consumo batteria"</string>
+    <string name="battery_since_unplugged">"Utilizzo batteria dallo scollegamento"</string>
+    <string name="battery_since_reset">"Utilizzo batteria dal ripristino"</string>
+    <string name="battery_stats_duration">"<xliff:g id="TIME">%1$s</xliff:g> dallo scollegamento"</string>
+    <string name="awake">"Tempo di attività dispositivo"</string>
+    <string name="wifi_on_time">"Tempo accensione Wi-Fi"</string>
+    <string name="bluetooth_on_time">"Tempo accensione Wi-Fi"</string>
+    <string name="usage_name_percent">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="PERCENT">%2$s</xliff:g>%%"</string>
+    <string name="details_title">"Dettagli utilizzo batteria"</string>
+    <string name="details_subtitle">"Dettagli di utilizzo"</string>
+    <string name="controls_subtitle">"Regola consumo alimentazione"</string>
+    <string name="packages_subtitle">"Pacchetti inclusi"</string>
+    <string name="power_screen">"Display"</string>
+    <string name="power_wifi">"Wi-Fi"</string>
+    <string name="power_bluetooth">"Bluetooth"</string>
+    <string name="power_cell">"Cellulare in standby"</string>
+    <string name="power_phone">"Chiamate vocali"</string>
+    <string name="power_idle">"Telefono inattivo"</string>
+    <string name="usage_type_cpu">"Totale CPU"</string>
+    <string name="usage_type_cpu_foreground">"CPU in primo piano"</string>
+    <string name="usage_type_gps">"GPS"</string>
+    <string name="usage_type_phone">"Telefono"</string>
+    <string name="usage_type_data_send">"Dati inviati"</string>
+    <string name="usage_type_data_recv">"Dati ricevuti"</string>
+    <string name="usage_type_audio">"Audio"</string>
+    <string name="usage_type_video">"Video"</string>
+    <string name="usage_type_on_time">"Tempo accensione"</string>
+    <string name="battery_action_stop">"Forza interruzione"</string>
+    <string name="battery_action_app_details">"Info applicazione"</string>
+    <string name="battery_action_app_settings">"Impostazioni applicazione"</string>
+    <string name="battery_action_display">"Impostazioni display"</string>
+    <string name="battery_action_wifi">"Impostazioni Wi-Fi"</string>
+    <string name="battery_action_bluetooth">"Impostazioni Bluetooth"</string>
+    <string name="battery_desc_voice">"Batteria utilizzata da chiamate vocali"</string>
+    <string name="battery_desc_standby">"Utilizzo batteria quando il telefono è inattivo"</string>
+    <string name="battery_desc_radio">"Batteria utilizzata da segnale cellulare"</string>
+    <string name="battery_sugg_radio">"Passa a modalità in volo per ridurre i consumi nelle aree senza copertura cellulare"</string>
+    <string name="battery_desc_display">"Batteria utilizzata da display e retroilluminazione"</string>
+    <string name="battery_sugg_display">"Riduci la luminosità e/o il timeout dello schermo"</string>
+    <string name="battery_desc_wifi">"Batteria utilizzata da Wi-Fi"</string>
+    <string name="battery_sugg_wifi">"Disattiva Wi-Fi quando non è in uso o dove non è disponibile"</string>
+    <string name="battery_desc_bluetooth">"Batteria utilizzata da Bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic">"Disattiva Bluetooth quando non è in uso"</string>
+    <string name="battery_sugg_bluetooth_headset">"Prova a connetterti a un altro dispositivo Bluetooth"</string>
+    <string name="battery_desc_apps">"Batteria utilizzata dalle applicazioni in esecuzione"</string>
+    <string name="battery_sugg_apps_info">"Interrompi o disinstalla l\'applicazione"</string>
+    <string name="battery_sugg_apps_gps">"Disattiva GPS quando non è in uso"</string>
+    <string name="battery_sugg_apps_settings">"L\'applicazione potrebbe offrire impostazioni per ridurre l\'utilizzo della batteria"</string>
+    <string name="menu_stats_unplugged">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> dallo scollegamento"</string>
+    <string name="menu_stats_last_unplugged">"Durante ultimo scollegamento per <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total">"Totali utilizzo"</string>
+    <string name="menu_stats_refresh">"Aggiorna"</string>
+    <string name="process_kernel_label">"Sistema operativo Android"</string>
+    <string name="process_mediaserver_label">"MediaServer"</string>
+    <string name="tts_settings">"Sintesi vocale"</string>
+    <string name="tts_settings_summary">"Imposta opzioni testo-voce"</string>
+    <string name="tts_settings_title">"Controlli sintetizzatore vocale"</string>
+    <string name="use_default_tts_settings_title">"Usa sempre le mie impostazioni"</string>
+    <string name="use_default_tts_settings_summary">"Le seguenti impostazioni predefinite hanno la priorità sulle impostazioni dell\'applicazione"</string>
+    <string name="tts_default_settings_section">"Impostazioni predefinite"</string>
+    <string name="tts_default_rate_title">"Velocità voce"</string>
+    <string name="tts_default_rate_summary">"Velocità di pronuncia del testo"</string>
+    <string name="tts_default_pitch_title">"Tono"</string>
+    <string name="tts_default_pitch_summary">"Interessa il tono del testo parlato"</string>
+    <string name="tts_default_lang_title">"Lingua"</string>
+    <string name="tts_default_lang_summary">"Imposta la voce specifica della lingua per il testo parlato"</string>
+    <string name="tts_play_example_title">"Ascolta un esempio"</string>
+    <string name="tts_play_example_summary">"Riproduci una breve dimostrazione della sintesi vocale"</string>
+    <string name="tts_install_data_title">"Installa dati vocali"</string>
+    <string name="tts_install_data_summary">"Installa i dati vocali richiesti per la sintesi vocale"</string>
+    <string name="tts_data_installed_summary">"Voci richieste per la sintesi vocale già installate"</string>
+    <string name="tts_demo">"Questo è un esempio di sintesi vocale."</string>
+    <string name="tts_settings_changed_demo">"Le tue impostazioni sono cambiate. Ecco un esempio di come possono suonare."</string>
+    <string name="gadget_title">"Controllo risparmio energia"</string>
+    <string name="vpn_settings_activity_title">"Impostazioni VPN"</string>
+    <string name="vpn_connect_to">"Connetti a %s"</string>
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <string name="vpn_password_colon">"Password:"</string>
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <string name="vpn_connect_button">"Connetti"</string>
+    <string name="vpn_yes_button">"Sì"</string>
+    <string name="vpn_no_button">"No"</string>
+    <string name="vpn_back_button">"Indietro"</string>
+    <string name="vpn_mistake_button">"No, è un errore"</string>
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <string name="vpn_connecting">"Connessione..."</string>
+    <string name="vpn_disconnecting">"Disconnessione..."</string>
+    <string name="vpn_connected">"Connessa"</string>
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <string name="vpn_profile_added">"%s è stato aggiunto"</string>
+    <string name="vpn_profile_replaced">"Le modifiche vengono apportate a %s"</string>
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 58c9761..5c4ce03 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -32,19 +32,30 @@
     <item>"10分"</item>
     <item>"常時点灯"</item>
   </string-array>
-  <string-array name="wifi_security_entries">
-    <item>"自動"</item>
-    <item>"なし"</item>
-    <item>"WEP"</item>
-    <item>"WPA Personal"</item>
-    <item>"WPA2 Personal"</item>
-  </string-array>
-  <string-array name="wifi_security_without_auto_entries">
-    <item>"なし"</item>
-    <item>"WEP"</item>
-    <item>"WPA Personal"</item>
-    <item>"WPA2 Personal"</item>
-  </string-array>
+    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
+    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
+    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
+    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
+    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
+    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
+    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
+    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
+    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
+    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
+    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
+    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
+    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
+    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
+    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
+    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
+    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
+    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
+    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
+    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
+    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
+    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
+    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
+    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item>"自動"</item>
     <item>"WEP ASCII"</item>
@@ -73,4 +84,15 @@
     <item>"起動回数"</item>
     <item>"アプリケーション名"</item>
   </string-array>
+    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
+    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
+    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
+    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
+    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
+    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
+    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
+    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b94265f..acc1fa9 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -104,10 +104,16 @@
     <string name="bluetooth_notif_ticker">"Bluetoothペア設定リクエスト"</string>
     <string name="bluetooth_notif_title">"ペア設定リクエスト"</string>
     <string name="bluetooth_notif_message">"ペアとして設定 "</string>
-    <string name="date_and_time">"日付形式"</string>
+    <string name="date_and_time">"日付と時刻"</string>
     <string name="date_time_12_hour_sample">"1:00 PM"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <!-- no translation found for date_time_changeTime_text (7037437020000867740) -->
+    <skip />
+    <!-- no translation found for date_time_changeDate_text (5259762626498028057) -->
+    <skip />
     <string name="choose_timezone">"タイムゾーンの選択"</string>
+    <!-- no translation found for normal_date_format (1982904221918374153) -->
+    <skip />
     <string name="display_preview_label">"プレビュー:"</string>
     <string name="display_font_size_label">"フォントサイズ:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -188,12 +194,33 @@
     <string name="proxy_settings_label">"プロキシ設定"</string>
     <string name="cancel">"キャンセル"</string>
     <string name="settings_label">"設定"</string>
+    <!-- no translation found for settings_shortcut (3672145147925639262) -->
+    <skip />
     <string name="airplane_mode">"機内モード"</string>
     <string name="airplane_mode_summary">"ワイヤレス接続をすべて無効にする"</string>
     <string name="airplane_mode_turning_on">"ワイヤレス接続を無効にしています..."</string>
     <string name="airplane_mode_turning_off">"ワイヤレス接続を有効にしています..."</string>
     <string name="radio_controls_title">"ワイヤレス設定"</string>
-    <string name="radio_controls_summary">"Wi-Fi、Bluetooth、機内モード、モバイルネットワークの管理"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
     <string name="date_and_time_settings_title">"日付と時刻"</string>
     <string name="date_and_time_settings_summary">"日付、時刻、タイムゾーンの設定"</string>
     <string name="date_time_auto">"自動"</string>
@@ -207,7 +234,8 @@
     <string name="zone_list_menu_sort_alphabetically">"アルファベット順"</string>
     <string name="zone_list_menu_sort_by_timezone">"タイムゾーン順"</string>
     <string name="security_settings_title">"セキュリティ &amp; 位置情報"</string>
-    <string name="security_settings_summary">"現在地情報、画面ロック、SIMカードロック"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"パスワード"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"BluetoothをONにする"</string>
@@ -220,6 +248,10 @@
     <string name="bluetooth_error_title">"注意"</string>
     <string name="bluetooth_pairing_error_message">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>とのペアリングで問題が発生しました。"</string>
     <string name="bluetooth_pairing_pin_error_message">"入力されたPINが正しくないため、<xliff:g id="DEVICE_NAME">%1$s</xliff:g>とのペアリングで問題が発生しました。"</string>
+    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
+    <skip />
     <string name="bluetooth_connecting_error_message">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>への接続で問題が発生しました。"</string>
     <string name="bluetooth_preference_scan_title">"デバイスのスキャン"</string>
     <string name="bluetooth_device_context_connect">"接続"</string>
@@ -260,11 +292,23 @@
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
+    <skip />
+    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
+    <skip />
     <string name="wifi_security_unknown">"不明"</string>
-    <string name="wifi_security_verbose_open">"オープンネットワーク"</string>
-    <string name="wifi_security_verbose_wep">"WEPにより保護"</string>
-    <string name="wifi_security_verbose_wpa">"WPAにより保護"</string>
-    <string name="wifi_security_verbose_wpa2">"WPA2により保護"</string>
+    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
+    <skip />
     <string name="ip_address">"IPアドレス"</string>
     <string name="signal">"電波強度"</string>
     <string name="wifi_starting">"ONにしています..."</string>
@@ -277,12 +321,27 @@
     <string name="error_saving">"ネットワークを保存できません"</string>
     <string name="connect">"接続"</string>
     <string name="connect_to_blank">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続"</string>
+    <!-- no translation found for please_select_eap (4488240331626456338) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for please_type_identity (7061261155499513089) -->
+    <skip />
+    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
+    <skip />
+    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
+    <skip />
+    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
+    <skip />
+    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
+    <skip />
     <string name="please_type_passphrase">"ワイヤレス接続パスワード"</string>
     <string name="please_type_hex_key">"WEPの16進キー (0～9、A～F)"</string>
     <string name="wifi_show_password">"パスワードを表示"</string>
     <string name="scan_wifi">"スキャン"</string>
     <string name="summary_not_in_range">"圏外"</string>
-    <string name="summary_remembered">"接続履歴あり"</string>
+    <!-- no translation found for summary_remembered (6079941090549401742) -->
+    <skip />
     <string name="summary_connection_failed">"接続できませんでした。選択すると再試行します。"</string>
     <string name="wifi_access_points">"Wi-Fiネットワーク"</string>
     <string name="wifi_type_ssid">"ネットワークSSID"</string>
@@ -292,7 +351,7 @@
     <string name="wifi_add_other_network">"Wi-Fiネットワークを追加"</string>
     <string name="wifi_notify_open_networks">"ネットワークの通知"</string>
     <string name="wifi_notify_open_networks_summary">"オープンネットワークが利用可能なときに通知する"</string>
-    <string name="wifi_password_incorrect_error">"入力したネットワークパスワードは正しくありません。再入力してください。"</string>
+    <string name="wifi_password_incorrect_error">"ネットワークキーまたはパスワードが正しくありません。入力し直してください。"</string>
     <string name="wifi_generic_connection_error">"ネットワーク接続に問題があります。やり直してください。"</string>
     <string name="wifi_menu_advanced">"詳細設定"</string>
     <string name="wifi_ip_settings_titlebar">"IP設定"</string>
@@ -360,10 +419,16 @@
     <string name="sound_effects_enable_summary_on">"メニュー選択時の操作音をONにする"</string>
     <string name="sound_effects_enable_summary_off">"メニュー選択時の操作音をONにする"</string>
     <string name="play_media_notification_sounds_enable_title">"SDカードの通知"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"SDカード通知音をOFFにする"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"SDカード通知音をONにする"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
+    <skip />
     <string name="sync_settings">"データの同期"</string>
     <string name="sync_settings_summary">"同期するアプリケーションの選択"</string>
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"画面設定"</string>
     <string name="animations_title">"アニメーション表示"</string>
     <string name="animations_summary_on">"ウィンドウの開閉をアニメーション表示"</string>
@@ -385,7 +450,7 @@
     <string name="sim_enter_pin">"SIM PIN"</string>
     <string name="sim_enable_sim_lock">"SIMカードをロック"</string>
     <string name="sim_disable_sim_lock">"SIMカードのロックを解除"</string>
-    <string name="sim_enter_old">"古いSIM PIN"</string>
+    <string name="sim_enter_old">"現在のSIM PIN"</string>
     <string name="sim_enter_new">"新しいSIM PIN"</string>
     <string name="sim_reenter_new">"新しいPINを再入力"</string>
     <string name="sim_change_pin">"SIM PIN"</string>
@@ -407,10 +472,18 @@
     <string name="device_info_not_available">"該当なし"</string>
     <string name="device_status_activity_title">"端末の状態"</string>
     <string name="device_status">"端末の状態"</string>
-    <string name="device_status_summary">"電池残量、電話番号、ネットワークなど"</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
     <string name="storage_settings_title">"SDカード &amp; 端末容量"</string>
     <string name="storage_settings_summary">"SDカードの取り外し、空き容量の表示"</string>
-    <string name="status_number">"電話番号"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"モバイルネットワークの種類"</string>
     <string name="status_data_state">"モバイルネットワークの状態"</string>
     <string name="status_service_state">"サービスの状態"</string>
@@ -464,9 +537,11 @@
     <string name="restore_default_apn_completed">"APN設定をリセットしました"</string>
     <string name="master_clear_title">"データの初期化"</string>
     <string name="master_clear_summary">"携帯電話内のすべてのデータを消去"</string>
-    <string name="master_clear_desc">"この操作は携帯電話を出荷時の初期状態にリセットし、データとダウンロードしたアプリケーションをすべて消去します。"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
     <string name="master_clear_button_text">"携帯電話をリセット"</string>
-    <string name="master_clear_final_desc">"データやアプリケーションをすべて消去して携帯電話をリセットしますか？この操作は元に戻せません。"</string>
+    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
+    <skip />
     <string name="master_clear_final_button_text">"すべて消去"</string>
     <string name="master_clear_gesture_prompt">"ロック解除パターンを入力してください"</string>
     <string name="master_clear_gesture_explanation">"携帯電話をリセットするには、ロック解除パターンを入力する必要があります。"</string>
@@ -483,13 +558,22 @@
     <string name="call_settings_summary">"ボイスメール、着信転送、発信者番号など"</string>
     <string name="network_settings_title">"モバイルネットワーク"</string>
     <string name="network_settings_summary">"ローミング、ネットワーク、APN設定"</string>
-    <string name="location_title">"位置情報の検出"</string>
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
     <string name="location_network_based">"ワイヤレスネットワークを使用"</string>
     <string name="location_networks_disabled">"無線ネットワークを使用するアプリケーション(地図など)で位置を表示する"</string>
     <string name="location_neighborhood_level">"Wi-Fi/モバイルネットワークで位置を検出する"</string>
     <string name="location_gps">"GPS機能をONにする"</string>
     <string name="location_street_level">"高精度測位（電池の消費を節約する場合はOFFにしてください）"</string>
     <string name="location_gps_disabled">"高精度測位（電池消費増、電波が良好な場所で使用）"</string>
+    <!-- no translation found for use_location_title (7585990952633568732) -->
+    <skip />
+    <!-- no translation found for use_location_summary (4411467143899877395) -->
+    <skip />
+    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
+    <skip />
+    <string name="agree">"同意する"</string>
+    <string name="disagree">"同意しない"</string>
     <string name="about_settings">"端末情報"</string>
     <string name="about_settings_summary">"端末情報、規約、バージョン情報"</string>
     <string name="legal_information">"法的情報"</string>
@@ -497,7 +581,8 @@
     <string name="copyright_title">"著作権"</string>
     <string name="license_title">"ライセンス"</string>
     <string name="terms_title">"利用規約"</string>
-    <string name="system_tutorial_list_item_title">"システムチュートリアル"</string>
+    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
+    <skip />
     <string name="system_tutorial_list_item_summary">"携帯電話の使用方法"</string>
     <string name="settings_license_activity_title">"オープンソースライセンス"</string>
     <string name="settings_license_activity_unavailable">"ライセンスの読み込み中に問題が発生しました。"</string>
@@ -520,8 +605,8 @@
     <string name="lockpattern_settings_title">"ロック解除パターン"</string>
     <string name="lockpattern_settings_enable_title">"パターン入力必須"</string>
     <string name="lockpattern_settings_enable_summary">"パターンを入力しないと画面ロックを解除しない"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title">"指の軌跡を線で表示する"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title">"パターンをなぞる操作音"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">"指の軌跡を線で表示"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"入力時のバイブレーション"</string>
     <string name="lockpattern_settings_choose_lock_pattern">"ロック解除パターン設定"</string>
     <string name="lockpattern_settings_change_lock_pattern">"パターンを変更する"</string>
     <string name="lockpattern_settings_help_how_to_record">"ロック解除パターンの描き方"</string>
@@ -555,6 +640,8 @@
     <string name="data_size_label">"データ"</string>
     <string name="uninstall_text">"アンインストール"</string>
     <string name="clear_user_data_text">"データを消去"</string>
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
     <string name="auto_launch_enable_text">"特定の操作で使用する既定アプリケーションとして設定されています。"</string>
     <string name="auto_launch_disable_text">"設定されている操作はありません。"</string>
     <string name="clear_activities">"設定を消去"</string>
@@ -576,10 +663,20 @@
     <string name="app_not_found_dlg_title">"アプリケーションが見つかりません"</string>
     <string name="app_not_found_dlg_text">"インストール済みアプリケーションのリストに、このアプリケーションはありません。"</string>
     <string name="clear_data_failed">"アプリケーションデータを消去できませんでした。"</string>
+    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
+    <skip />
     <string name="security_settings_desc">"このアプリケーションは下記にアクセスできます:"</string>
     <string name="computing_size">"計算中..."</string>
     <string name="invalid_size_value">"パッケージのサイズを計算できません"</string>
     <string name="empty_list_msg">"サードパーティ製のアプリケーションはインストールされていません。"</string>
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
     <string name="language_settings">"地域/言語 &amp; 文字入力"</string>
     <string name="language_settings_summary">"言語と地域、文字入力の設定"</string>
     <string name="language_category">"地域/言語設定"</string>
@@ -587,9 +684,9 @@
     <string name="phone_language">"地域/言語を選択"</string>
     <string name="phone_language_summary">"言語と地域の選択"</string>
     <string name="auto_replace">"自動修正"</string>
-    <string name="auto_replace_summary">"入力ミスを自動修正する"</string>
+    <string name="auto_replace_summary">"入力間違いを自動修正する"</string>
     <string name="auto_caps">"自動大文字変換"</string>
-    <string name="auto_caps_summary">"先頭文字を大文字に変換する"</string>
+    <string name="auto_caps_summary">"英字入力で文頭文字を大文字にする"</string>
     <string name="auto_punctuate">"ピリオド自動挿入"</string>
     <string name="hardkeyboard_category">"キーボードの設定"</string>
     <string name="auto_punctuate_summary">"英語: Spaceキー2回でピリオド(.)を挿入"</string>
@@ -598,13 +695,13 @@
     <string name="ime_security_warning">"この入力方法では入力したすべてのテキストの収集を許可します。収集されるテキストには個人情報データやクレジットカード番号などが含まれます。これはアプリケーション<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>によるものです。この入力方法を有効にしますか？"</string>
     <string name="user_dict_settings_titlebar">"ユーザー辞書"</string>
     <string name="user_dict_settings_title">"ユーザー辞書"</string>
-    <string name="user_dict_settings_summary">"ユーザー辞書への語句の追加と削除"</string>
+    <string name="user_dict_settings_summary">"ユーザー辞書に単語を登録／削除する"</string>
     <string name="user_dict_settings_add_menu_title">"追加"</string>
     <string name="user_dict_settings_add_dialog_title">"辞書に追加"</string>
     <string name="user_dict_settings_edit_dialog_title">"語句の編集"</string>
     <string name="user_dict_settings_context_menu_edit_title">"編集"</string>
     <string name="user_dict_settings_context_menu_delete_title">"削除"</string>
-    <string name="user_dict_settings_empty_text">"ユーザー辞書に何も登録されていません。語句はメニューから登録できます。"</string>
+    <string name="user_dict_settings_empty_text">"ユーザー辞書に登録がありません。MENUから単語を登録してください。"</string>
     <string name="testing">"テスト中"</string>
     <string name="testing_phone_info">"携帯電話情報"</string>
     <string name="testing_battery_info">"電池情報"</string>
@@ -634,6 +731,10 @@
     <string name="keep_screen_on_summary">"充電中に画面をスリープにしない"</string>
     <string name="allow_mock_location">"擬似ロケーションを許可"</string>
     <string name="allow_mock_location_summary">"擬似ロケーションを許可"</string>
+    <!-- no translation found for adb_warning_title (1756027479229533250) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (5352555112049663033) -->
+    <skip />
     <string name="gadget_picker_title">"ガジェットを選択"</string>
     <string name="widget_picker_title">"ウィジェットを選択"</string>
     <string name="battery_history_details_for">"UID %dの詳細"</string>
@@ -647,10 +748,14 @@
     <string name="battery_history_system_time">"システム利用時間:"</string>
     <string name="battery_history_total_time">"合計時間:"</string>
     <string name="battery_history_starts">"起動: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g>日<xliff:g id="HOURS">%2$d</xliff:g>時間<xliff:g id="MINUTES">%3$d</xliff:g>分<xliff:g id="SECONDS">%4$d</xliff:g>秒"</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g>時間<xliff:g id="MINUTES">%2$d</xliff:g>分<xliff:g id="SECONDS">%3$d</xliff:g>秒"</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g>分<xliff:g id="SECONDS">%2$d</xliff:g>秒"</string>
-    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g>秒"</string>
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
     <string name="battery_history_packages_sharing_this_uid">"このUIDを共有するパッケージ:"</string>
     <string name="battery_history_no_data">"充電池使用データなし"</string>
     <string name="battery_history_sensor">"センサー:"</string>
@@ -672,4 +777,372 @@
     <string name="app_name_label">"アプリケーション"</string>
     <string name="launch_count_label">"回数"</string>
     <string name="usage_time_label">"使用時間"</string>
+    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
+    <skip />
+    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
+    <skip />
+    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
+    <skip />
+    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (4630925382578609056) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
+    <skip />
+    <!-- no translation found for usage_name_percent (1899151069711662289) -->
+    <skip />
+    <!-- no translation found for details_title (7564809986329021063) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (2353149143338929583) -->
+    <skip />
+    <!-- no translation found for power_wifi (2382791137776486974) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (7052979399415080971) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
+    <skip />
+    <!-- no translation found for battery_action_display (5302763261448580102) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3003604969548979254) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (1834412555123982714) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for tts_settings (6454363854545277027) -->
+    <skip />
+    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (5064947197040356736) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_demo (405357591189935876) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for gadget_title (7455548605888590466) -->
+    <skip />
+    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
+    <skip />
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
+    <skip />
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
+    <skip />
+    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
+    <skip />
+    <!-- no translation found for vpn_no_button (7620339571187119107) -->
+    <skip />
+    <!-- no translation found for vpn_back_button (192036339792734970) -->
+    <skip />
+    <!-- no translation found for vpn_mistake_button (1759404628590603933) -->
+    <skip />
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <!-- no translation found for vpn_connecting (8039521381692090116) -->
+    <skip />
+    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
+    <skip />
+    <!-- no translation found for vpn_connected (7641723116362845781) -->
+    <skip />
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 36869cb..154e7c5 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -32,19 +32,30 @@
     <item>"10분"</item>
     <item>"시간제한 없음"</item>
   </string-array>
-  <string-array name="wifi_security_entries">
-    <item>"자동"</item>
-    <item>"없음"</item>
-    <item>"WEP"</item>
-    <item>"WPA 개인"</item>
-    <item>"WPA2 개인"</item>
-  </string-array>
-  <string-array name="wifi_security_without_auto_entries">
-    <item>"없음"</item>
-    <item>"WEP"</item>
-    <item>"WPA 개인"</item>
-    <item>"WPA2 개인"</item>
-  </string-array>
+    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
+    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
+    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
+    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
+    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
+    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
+    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
+    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
+    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
+    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
+    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
+    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
+    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
+    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
+    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
+    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
+    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
+    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
+    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
+    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
+    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
+    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
+    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
+    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item>"자동"</item>
     <item>"WEP ASCII"</item>
@@ -53,7 +64,7 @@
   <string-array name="wifi_sleep_policy_entries">
     <item>"화면이 꺼질 때"</item>
     <item>"전원에 연결되었을 때는 절전 모드로 전환되지 않음"</item>
-    <item>"전환 안 됨"</item>
+    <item>"안함"</item>
   </string-array>
   <string-array name="battery_history_type_spinner">
     <item>"CPU 사용량"</item>
@@ -73,4 +84,15 @@
     <item>"계수 시작"</item>
     <item>"응용프로그램 이름"</item>
   </string-array>
+    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
+    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
+    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
+    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
+    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
+    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
+    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
+    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f813462..aad6553 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -19,28 +19,28 @@
     <string name="turn_on_radio">"무선 켜기"</string>
     <string name="turn_off_radio">"무선 끄기"</string>
     <string name="turn_on_qxdm">"QXDM SD 로그 사용"</string>
-    <string name="turn_off_qxdm">"QXDM SD 로그 사용 안 함"</string>
+    <string name="turn_off_qxdm">"QXDM SD 로그 사용 안함"</string>
     <string name="radioInfo_menu_viewADN">"SIM 주소록 보기"</string>
-    <string name="radioInfo_menu_viewFDN">"FDN(전화걸 수 있는 번호) 보기"</string>
+    <string name="radioInfo_menu_viewFDN">"발신 허용 번호 보기"</string>
     <string name="radioInfo_menu_viewSDN">"SDN(Service Dialing Numbers) 보기"</string>
     <string name="radioInfo_menu_getPDP">"PDP 목록 가져오기"</string>
     <string name="radioInfo_menu_enableData">"데이터 연결 사용"</string>
-    <string name="radioInfo_menu_disableData">"데이터 연결 사용 안 함"</string>
+    <string name="radioInfo_menu_disableData">"데이터 연결 사용 안함"</string>
     <string name="radioInfo_menu_enableDataOnBoot">"부팅할 때 데이터 사용"</string>
-    <string name="radioInfo_menu_disableDataOnBoot">"부팅할 때 데이터 사용 안 함"</string>
+    <string name="radioInfo_menu_disableDataOnBoot">"부팅할 때 데이터 사용 중지"</string>
     <string name="radioInfo_service_in">"서비스 상태"</string>
     <string name="radioInfo_service_out">"서비스 지역 벗어남"</string>
     <string name="radioInfo_service_emergency">"비상 전화만"</string>
     <string name="radioInfo_service_off">"무선 연결 끊김"</string>
     <string name="radioInfo_roaming_in">"로밍"</string>
-    <string name="radioInfo_roaming_not">"로밍 안 함"</string>
-    <string name="radioInfo_phone_idle">"유휴"</string>
+    <string name="radioInfo_roaming_not">"로밍 안함"</string>
+    <string name="radioInfo_phone_idle">"자리 비움"</string>
     <string name="radioInfo_phone_ringing">"벨이 울림"</string>
     <string name="radioInfo_phone_offhook">"진행 중인 통화"</string>
-    <string name="radioInfo_data_disconnected">"연결끊김"</string>
+    <string name="radioInfo_data_disconnected">"연결 끊김"</string>
     <string name="radioInfo_data_connecting">"연결 중"</string>
     <string name="radioInfo_data_connected">"연결됨"</string>
-    <string name="radioInfo_data_suspended">"일시정지됨"</string>
+    <string name="radioInfo_data_suspended">"일시 정지됨"</string>
     <string name="radioInfo_unknown">"알 수 없음"</string>
     <string name="radioInfo_display_packets">"pkts"</string>
     <string name="radioInfo_display_bytes">"바이트"</string>
@@ -49,7 +49,7 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"SD 카드 마운트 해제"</string>
-    <string name="sdcard_format">"SD 카드가 포맷됩니다."</string>
+    <string name="sdcard_format">"SD 카드가 포맷"</string>
     <string name="small_font">"작게"</string>
     <string name="medium_font">"보통"</string>
     <string name="large_font">"크게"</string>
@@ -67,13 +67,13 @@
     <string name="battery_info_uptime">"부팅 후 시간:"</string>
     <string name="battery_info_awake_battery">"배터리 무중단 가동 시간:"</string>
     <string name="battery_info_awake_plugged">"충전할 때 무중단 가동 시간:"</string>
-    <string name="battery_info_screen_on">"화면 켜짐:"</string>
+    <string name="battery_info_screen_on">"화면 켜짐시간:"</string>
     <string name="battery_info_status_unknown">"알 수 없음"</string>
     <string name="battery_info_status_charging">"충전 중"</string>
     <string name="battery_info_status_charging_ac">"(AC)"</string>
     <string name="battery_info_status_charging_usb">"(USB)"</string>
     <string name="battery_info_status_discharging">"방전 중"</string>
-    <string name="battery_info_status_not_charging">"충전 안 함"</string>
+    <string name="battery_info_status_not_charging">"충전 안함"</string>
     <string name="battery_info_status_full">"충전 완료"</string>
     <string name="battery_info_health_unknown">"알 수 없음"</string>
     <string name="battery_info_health_good">"좋음"</string>
@@ -91,7 +91,7 @@
     <string name="bluetooth_scan_for_devices">"장치 검색"</string>
     <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 연결이 끊어집니다."</string>
     <string name="bluetooth_connected">"연결됨"</string>
-    <string name="bluetooth_disconnected">"연결끊김"</string>
+    <string name="bluetooth_disconnected">"연결 끊김"</string>
     <string name="bluetooth_disconnecting">"연결을 끊는 중..."</string>
     <string name="bluetooth_connecting">"연결 중..."</string>
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
@@ -105,14 +105,18 @@
     <string name="bluetooth_notif_title">"페어링 요청"</string>
     <string name="bluetooth_notif_message">"페어링하려면 선택합니다. "</string>
     <string name="date_and_time">"날짜 및 시간 설정"</string>
-    <string name="date_time_12_hour_sample">"1:00 pm"</string>
+    <string name="date_time_12_hour_sample">"1:00 PM"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"시간 변경"</string>
+    <string name="date_time_changeDate_text">"날짜"</string>
     <string name="choose_timezone">"표준시간대 선택"</string>
+    <!-- no translation found for normal_date_format (1982904221918374153) -->
+    <skip />
     <string name="display_preview_label">"미리보기:"</string>
     <string name="display_font_size_label">"글꼴 크기:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
     <skip />
-    <string name="intent_sender_sendbroadcast_text">"<xliff:g id="BROADCAST">broadcast</xliff:g> 보내기"</string>
+    <string name="intent_sender_sendbroadcast_text">"전송<xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
     <string name="intent_sender_startactivity_text">"<xliff:g id="ACTIVITY">activity</xliff:g> 시작"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
@@ -153,12 +157,12 @@
     <string name="radio_info_ping_ipaddr">"IP 주소 Ping:"</string>
     <string name="radio_info_ping_hostname">"호스트이름(www.google.com) Ping:"</string>
     <string name="radio_info_http_client_test">"HTTP 클라이언트 테스트:"</string>
-    <string name="radio_info_toggle_ciph_label">"암호화 토글"</string>
+    <string name="radio_info_toggle_ciph_label">"암호화 선택"</string>
     <string name="ping_test_label">"Ping 테스트 실행"</string>
     <string name="radio_info_smsc_label">"SMSC:"</string>
     <string name="radio_info_smsc_update_label">"업데이트"</string>
     <string name="radio_info_smsc_refresh_label">"새로고침"</string>
-    <string name="radio_info_toggle_dns_check_label">"DNS 확인 토글"</string>
+    <string name="radio_info_toggle_dns_check_label">"DNS 확인 선택"</string>
     <string name="band_mode_title">"GSM/UMTS 대역 설정"</string>
     <string name="band_mode_loading">"대역 목록 로드 중..."</string>
     <string name="band_mode_set">"설정"</string>
@@ -183,17 +187,38 @@
     <string name="battery_info_label">"배터리 정보"</string>
     <string name="battery_history_label">"배터리 기록"</string>
     <string name="display_label">"디스플레이"</string>
-    <string name="phone_info_label">"전화기 정보"</string>
+    <string name="phone_info_label">"휴대폰 정보"</string>
     <string name="sd_card_settings_label">"SD 카드"</string>
     <string name="proxy_settings_label">"프록시 설정"</string>
     <string name="cancel">"취소"</string>
     <string name="settings_label">"설정"</string>
-    <string name="airplane_mode">"에어플레인 모드"</string>
-    <string name="airplane_mode_summary">"모든 무선 연결 사용 안 함"</string>
+    <!-- no translation found for settings_shortcut (3672145147925639262) -->
+    <skip />
+    <string name="airplane_mode">"비행 모드"</string>
+    <string name="airplane_mode_summary">"모든 무선 연결 사용 안함"</string>
     <string name="airplane_mode_turning_on">"무선 연결을 끊는 중..."</string>
     <string name="airplane_mode_turning_off">"무선 연결 사용 중..."</string>
     <string name="radio_controls_title">"무선 제어"</string>
-    <string name="radio_controls_summary">"Wi-Fi, Bluetooth, 에어플레인 모드 및 모바일 네트워크 관리"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
     <string name="date_and_time_settings_title">"날짜 및 시간"</string>
     <string name="date_and_time_settings_summary">"날짜, 시간, 표준시간대 및 형식 설정"</string>
     <string name="date_time_auto">"자동"</string>
@@ -207,7 +232,8 @@
     <string name="zone_list_menu_sort_alphabetically">"사전순으로 정렬"</string>
     <string name="zone_list_menu_sort_by_timezone">"시간대별 정렬"</string>
     <string name="security_settings_title">"보안 및 위치"</string>
-    <string name="security_settings_summary">"내 위치, 화면 잠금해제, SIM 카드 잠금 설정"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"비밀번호"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Bluetooth 켜기"</string>
@@ -218,8 +244,12 @@
     <string name="bluetooth_device_info">"Bluetooth 장치 정보"</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"페어링을 위해 PIN 입력"\n"(0000 또는 1234를 입력하세요.)"</string>
     <string name="bluetooth_error_title">"주의"</string>
-    <string name="bluetooth_pairing_error_message">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>과(와) 페어링하는 동안 문제가 발생했습니다."</string>
-    <string name="bluetooth_pairing_pin_error_message">"입력한 PIN이 올바르지 않기 때문에 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>과(와) 페어링하는 동안 문제가 발생했습니다."</string>
+    <string name="bluetooth_pairing_error_message">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하는 동안 문제가 발생했습니다."</string>
+    <string name="bluetooth_pairing_pin_error_message">"입력한 PIN이 올바르지 않기 때문에 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하는 동안 문제가 발생했습니다."</string>
+    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
+    <skip />
     <string name="bluetooth_connecting_error_message">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에 연결하는 동안 문제가 발생했습니다."</string>
     <string name="bluetooth_preference_scan_title">"장치 검색"</string>
     <string name="bluetooth_device_context_connect">"연결"</string>
@@ -230,25 +260,25 @@
     <string name="bluetooth_device_context_connect_advanced">"옵션..."</string>
     <string name="bluetooth_connect_specific_profiles_title">"연결..."</string>
     <string name="bluetooth_profile_a2dp">"미디어"</string>
-    <string name="bluetooth_profile_headset">"전화"</string>
+    <string name="bluetooth_profile_headset">"휴대폰"</string>
     <string name="bluetooth_summary_connected_to_a2dp">"미디어 오디오에 연결됨"</string>
-    <string name="bluetooth_summary_connected_to_headset">"전화기 오디오에 연결됨"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset">"전화기 및 미디어 오디오에 연결됨"</string>
+    <string name="bluetooth_summary_connected_to_headset">"휴대폰 오디오에 연결됨"</string>
+    <string name="bluetooth_summary_connected_to_a2dp_headset">"휴대폰 및 미디어 오디오에 연결됨"</string>
     <string name="bluetooth_device_advanced_title">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 옵션"</string>
     <string name="bluetooth_device_advanced_online_mode_title">"연결"</string>
     <string name="bluetooth_device_advanced_online_mode_summary">"Bluetooth 장치에 연결"</string>
     <string name="bluetooth_device_advanced_profile_header_title">"프로필"</string>
     <string name="bluetooth_a2dp_profile_summary_connected">"미디어 오디오에 연결됨"</string>
-    <string name="bluetooth_headset_profile_summary_connected">"전화기 오디오에 연결됨"</string>
+    <string name="bluetooth_headset_profile_summary_connected">"휴대폰 오디오에 연결됨"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for">"미디어 오디오에 사용"</string>
-    <string name="bluetooth_headset_profile_summary_use_for">"전화기 오디오에 사용"</string>
+    <string name="bluetooth_headset_profile_summary_use_for">"휴대폰 오디오에 사용"</string>
     <string name="wifi">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary">"Wi-Fi 켜기"</string>
     <string name="wifi_settings">"Wi-Fi 설정"</string>
     <string name="wifi_settings_category">"Wi-Fi 설정"</string>
     <string name="wifi_settings_summary">"무선 액세스포인트 설정 및 관리"</string>
-    <string name="forget_network">"저장 안 함"</string>
+    <string name="forget_network">"저장 안함"</string>
     <string name="wifi_status">"상태"</string>
     <string name="wifi_link_speed">"속도"</string>
     <string name="wifi_signal_3">"우수"</string>
@@ -256,15 +286,27 @@
     <string name="wifi_signal_1">"양호"</string>
     <string name="wifi_signal_0">"나쁨"</string>
     <string name="security">"보안"</string>
-    <string name="wifi_security_open">"개방"</string>
+    <string name="wifi_security_open">"열기"</string>
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
+    <skip />
+    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
+    <skip />
     <string name="wifi_security_unknown">"알 수 없음"</string>
-    <string name="wifi_security_verbose_open">"개방형 네트워크"</string>
-    <string name="wifi_security_verbose_wep">"WEP로 보안"</string>
-    <string name="wifi_security_verbose_wpa">"WPA로 보안"</string>
-    <string name="wifi_security_verbose_wpa2">"WPA2로 보안"</string>
+    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
+    <skip />
     <string name="ip_address">"IP 주소"</string>
     <string name="signal">"신호 강도"</string>
     <string name="wifi_starting">"켜는 중..."</string>
@@ -277,18 +319,33 @@
     <string name="error_saving">"네트워크를 저장할 수 없음"</string>
     <string name="connect">"연결"</string>
     <string name="connect_to_blank">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결"</string>
+    <!-- no translation found for please_select_eap (4488240331626456338) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for please_type_identity (7061261155499513089) -->
+    <skip />
+    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
+    <skip />
+    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
+    <skip />
+    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
+    <skip />
+    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
+    <skip />
     <string name="please_type_passphrase">"무선 비밀번호"</string>
     <string name="please_type_hex_key">"WEP 16진수 키(0-9, A-F)"</string>
     <string name="wifi_show_password">"비밀번호를 표시합니다."</string>
     <string name="scan_wifi">"검색"</string>
     <string name="summary_not_in_range">"범위 내에 없음"</string>
-    <string name="summary_remembered">"저장됨"</string>
+    <!-- no translation found for summary_remembered (6079941090549401742) -->
+    <skip />
     <string name="summary_connection_failed">"연결하지 못했습니다. 다시 시도하세요."</string>
     <string name="wifi_access_points">"Wi-Fi 네트워크"</string>
     <string name="wifi_type_ssid">"네트워크 SSID"</string>
     <string name="wifi_security">"보안"</string>
     <string name="wifi_save_config">"저장"</string>
-    <string name="wifi_password_unchanged">"(변경 안 함)"</string>
+    <string name="wifi_password_unchanged">"(변경 안함)"</string>
     <string name="wifi_add_other_network">"Wi-Fi 네트워크 추가"</string>
     <string name="wifi_notify_open_networks">"네트워크 알림"</string>
     <string name="wifi_notify_open_networks_summary">"개방형 네트워크를 사용할 수 있을 때 알림"</string>
@@ -306,7 +363,7 @@
     <string name="wifi_gateway">"게이트웨이"</string>
     <string name="wifi_netmask">"넷마스크"</string>
     <string name="wifi_context_menu_connect">"네트워크 연결"</string>
-    <string name="wifi_context_menu_forget">"네트워크 저장 안 함"</string>
+    <string name="wifi_context_menu_forget">"네트워크 저장 안함"</string>
     <string name="wifi_context_menu_change_password">"비밀번호 변경"</string>
     <string name="wifi_advanced_titlebar">"고급"</string>
     <string name="wifi_setting_num_channels_title">"규정 도메인"</string>
@@ -323,7 +380,7 @@
     <string name="fragment_status_obtaining_ip">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에서 IP 주소를 가져오는 중..."</string>
     <string name="fragment_status_connected">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결됨"</string>
     <string name="fragment_status_disconnecting">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에서 연결을 끊는 중..."</string>
-    <string name="fragment_status_disconnected">"연결끊김"</string>
+    <string name="fragment_status_disconnected">"연결 끊김"</string>
     <string name="fragment_status_failed">"실패"</string>
     <string name="status_scanning">"검색 중..."</string>
     <string name="status_connecting">"연결 중..."</string>
@@ -331,13 +388,13 @@
     <string name="status_obtaining_ip">"주소를 가져오는 중..."</string>
     <string name="status_connected">"연결됨"</string>
     <string name="status_disconnecting">"연결을 끊는 중..."</string>
-    <string name="status_disconnected">"연결끊김"</string>
+    <string name="status_disconnected">"연결 끊김"</string>
     <string name="status_failed">"실패"</string>
     <string name="sound_and_display_settings">"소리 및 디스플레이"</string>
     <string name="sound_settings">"소리 설정"</string>
     <string name="sound_and_display_settings_summary">"벨소리, 알림, 화면 밝기 설정"</string>
     <string name="silent_mode_title">"무음 모드"</string>
-    <string name="silent_mode_summary">"미디어 및 알람 외의 모든 소리가 나지 않습니다."</string>
+    <string name="silent_mode_summary">"미디어 및 알람을 제외하고 모두 무음 모드로 전환됩니다."</string>
     <string name="silent_mode_incl_alarm_summary">"미디어를 제외하고 모두 무음 모드로 전환됩니다."</string>
     <string name="ringtone_title">"전화 벨소리"</string>
     <string name="ringtone_summary">"수신전화 기본 벨소리 설정"</string>
@@ -360,10 +417,16 @@
     <string name="sound_effects_enable_summary_on">"화면 선택 시 소리 재생"</string>
     <string name="sound_effects_enable_summary_off">"화면 선택 시 소리 재생"</string>
     <string name="play_media_notification_sounds_enable_title">"SD 카드 알림"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"SD 카드 알림 소리 사용 중지"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"SD 카드 알림 소리 사용"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
+    <skip />
     <string name="sync_settings">"데이터 동기화"</string>
     <string name="sync_settings_summary">"동기화할 응용프로그램 선택"</string>
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"디스플레이 설정"</string>
     <string name="animations_title">"애니메이션"</string>
     <string name="animations_summary_on">"창을 열고 닫을 때 애니메이션 표시"</string>
@@ -379,8 +442,8 @@
     <string name="sim_lock_settings_category">"SIM 카드 잠금 설정"</string>
     <string name="sim_lock_settings_title">"SIM 카드 잠금"</string>
     <string name="sim_pin_toggle">"SIM 카드 잠금"</string>
-    <string name="sim_lock_on">"전화기를 사용하려면 PIN 필요"</string>
-    <string name="sim_lock_off">"전화기를 사용하려면 PIN 필요"</string>
+    <string name="sim_lock_on">"휴대폰을 사용하려면 PIN 필요"</string>
+    <string name="sim_lock_off">"휴대폰을 사용하려면 PIN 필요"</string>
     <string name="sim_pin_change">"SIM PIN 변경"</string>
     <string name="sim_enter_pin">"SIM PIN"</string>
     <string name="sim_enable_sim_lock">"SIM 카드 잠금"</string>
@@ -392,11 +455,11 @@
     <string name="sim_bad_pin">"PIN이 잘못되었습니다."</string>
     <string name="sim_pins_dont_match">"PIN이 일치하지 않습니다."</string>
     <string name="sim_change_failed">"PIN을 변경할 수 없습니다."\n"PIN이 잘못된 것 같습니다."</string>
-    <string name="sim_change_succeeded">"SIM PIN 변경됨"</string>
+    <string name="sim_change_succeeded">"SIM PIN이 변경되었습니다."</string>
     <string name="sim_lock_failed">"SIM 카드 잠금 상태를 변경할 수 없습니다."\n"PIN이 잘못된 것 같습니다."</string>
     <string name="sim_enter_ok">"확인"</string>
     <string name="sim_enter_cancel">"취소"</string>
-    <string name="device_info_settings">"전화기 상태"</string>
+    <string name="device_info_settings">"휴대폰 상태"</string>
     <string name="system_update_settings_list_item_title">"시스템 업데이트"</string>
     <string name="system_update_settings_list_item_summary">"시스템 업데이트 확인"</string>
     <string name="firmware_version">"펌웨어 버전"</string>
@@ -407,10 +470,18 @@
     <string name="device_info_not_available">"표시할 수 없음"</string>
     <string name="device_status_activity_title">"상태"</string>
     <string name="device_status">"상태"</string>
-    <string name="device_status_summary">"IMEI, 전화번호, 신호 등"</string>
-    <string name="storage_settings_title">"SD 카드 및 전화기 저장공간"</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
+    <string name="storage_settings_title">"SD 카드 및 휴대폰 저장공간"</string>
     <string name="storage_settings_summary">"SD 카드 마운트 해제, 사용가능한 저장공간 보기"</string>
-    <string name="status_number">"전화번호"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"모바일 네트워크 유형"</string>
     <string name="status_data_state">"모바일 네트워크 상태"</string>
     <string name="status_service_state">"서비스 상태"</string>
@@ -422,7 +493,7 @@
     <string name="status_unavailable">"사용할 수 없음"</string>
     <string name="status_up_time">"가동 시간"</string>
     <string name="status_awake_time">"무중단 가동 시간"</string>
-    <string name="internal_memory">"전화기 내부 저장공간"</string>
+    <string name="internal_memory">"휴대폰 내부 저장공간"</string>
     <string name="sd_memory">"SD 카드"</string>
     <string name="memory_available">"사용가능한 저장공간"</string>
     <string name="memory_size">"총 공간"</string>
@@ -436,7 +507,7 @@
     <string name="battery_level_title">"배터리 수준"</string>
     <string name="apn_settings">"APN"</string>
     <string name="apn_edit">"액세스포인트 편집"</string>
-    <string name="apn_not_set">"&lt;설정 안 함&gt;"</string>
+    <string name="apn_not_set">"&lt;설정 안함&gt;"</string>
     <string name="apn_name">"이름"</string>
     <string name="apn_apn">"APN"</string>
     <string name="apn_http_proxy">"프록시"</string>
@@ -453,27 +524,29 @@
     <string name="menu_delete">"APN 삭제"</string>
     <string name="menu_new">"새 APN"</string>
     <string name="menu_save">"저장"</string>
-    <string name="menu_cancel">"삭제"</string>
+    <string name="menu_cancel">"무시"</string>
     <string name="error_title">"주의"</string>
     <string name="error_name_empty">"이름 필드는 비워둘 수 없습니다."</string>
     <string name="error_apn_empty">"APN을 비워둘 수 없습니다."</string>
     <string name="error_mcc_not3">"MCC 필드는 3자리 숫자여야 합니다."</string>
-    <string name="error_mnc_not23">"MNC 필드는 2~3자리 숫자여야 합니다."</string>
+    <string name="error_mnc_not23">"MNC 필드는 2~ 3자리 숫자여야 합니다."</string>
     <string name="restore_default_apn">"기본 APN 설정 복원 중"</string>
     <string name="menu_restore">"기본값으로 재설정"</string>
     <string name="restore_default_apn_completed">"기본 APN 설정을 재설정했습니다."</string>
-    <string name="master_clear_title">"공장 기본값 데이터 재설정"</string>
-    <string name="master_clear_summary">"전화기의 모든 데이터 지우기"</string>
-    <string name="master_clear_desc">"이 작업을 수행하면 전화기의 모든 데이터 및 다운로드한 응용프로그램이 지워지고 출고시 초기 상태로 재설정됩니다"</string>
-    <string name="master_clear_button_text">"전화기 재설정"</string>
-    <string name="master_clear_final_desc">"모든 데이터 및 응용프로그램을 지우고 전화기를 재설정하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
+    <string name="master_clear_title">"기본값 데이터 재설정"</string>
+    <string name="master_clear_summary">"휴대폰의 모든 데이터 지우기"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
+    <string name="master_clear_button_text">"휴대폰 재설정"</string>
+    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
+    <skip />
     <string name="master_clear_final_button_text">"모두 지우기"</string>
-    <string name="master_clear_gesture_prompt">"잠금해제 패턴 그리기"</string>
-    <string name="master_clear_gesture_explanation">"전화기 재설정을 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="master_clear_gesture_prompt">"잠금해제 패턴을 그리세요."</string>
+    <string name="master_clear_gesture_explanation">"휴대폰 재설정을 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="master_clear_failed">"시스템 지우기 서비스를 사용할 수 없어 재설정을 수행하지 못했습니다."</string>
     <string name="media_format_title">"SD 카드를 포맷합니다."</string>
     <string name="media_format_summary">"SD 카드의 모든 데이터 지우기"</string>
-    <string name="media_format_desc">"이 작업을 수행하면 전화기의 SD 카드에 저장된 모든 데이터를 잃게 됩니다."</string>
+    <string name="media_format_desc">"이 작업을 수행하면 휴대폰의 SD 카드에 저장된 모든 데이터를 잃게 됩니다."</string>
     <string name="media_format_button_text">"SD 카드 포맷"</string>
     <string name="media_format_final_desc">"SD 카드를 포맷하여 모든 미디어를 지우시겠습니까? 수행한 작업은 취소할 수 없습니다."</string>
     <string name="media_format_final_button_text">"모두 지우기"</string>
@@ -483,21 +556,31 @@
     <string name="call_settings_summary">"음성메일, 착신전환, 통화중 대기, 발신자 번호 설정"</string>
     <string name="network_settings_title">"모바일 네트워크"</string>
     <string name="network_settings_summary">"로밍, 네트워크, APN에 대한 옵션 설정"</string>
-    <string name="location_title">"내 위치 소스"</string>
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
     <string name="location_network_based">"무선 네트워크 사용"</string>
     <string name="location_networks_disabled">"무선 네트워크를 사용하는 응용프로그램(예: 지도)에서 위치 보기"</string>
     <string name="location_neighborhood_level">"Wi-Fi 및/또는 모바일 네트워크에서 측정된 위치"</string>
     <string name="location_gps">"GPS 위성 사용"</string>
     <string name="location_street_level">"도로 수준으로 정확하게 탐색(배터리를 절약하려면 선택 취소)"</string>
     <string name="location_gps_disabled">"도로 수준으로 탐색(항공사진이 더해져 배터리 추가로 필요)"</string>
-    <string name="about_settings">"전화기 정보"</string>
-    <string name="about_settings_summary">"법률 정보, 전화기 상태, 소프트웨어 버전 보기"</string>
+    <!-- no translation found for use_location_title (7585990952633568732) -->
+    <skip />
+    <!-- no translation found for use_location_summary (4411467143899877395) -->
+    <skip />
+    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
+    <skip />
+    <string name="agree">"동의함"</string>
+    <string name="disagree">"동의하지 않음"</string>
+    <string name="about_settings">"휴대폰 정보"</string>
+    <string name="about_settings_summary">"법률 정보, 휴대폰 상태, 소프트웨어 버전 보기"</string>
     <string name="legal_information">"법률정보"</string>
-    <string name="contributors_title">"조력자"</string>
+    <string name="contributors_title">"도움을 주신 분들"</string>
     <string name="copyright_title">"저작권"</string>
     <string name="license_title">"라이센스"</string>
     <string name="terms_title">"약관"</string>
-    <string name="system_tutorial_list_item_title">"시스템 안내서"</string>
+    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
+    <skip />
     <string name="system_tutorial_list_item_summary">"휴대전화 사용법 알아보기"</string>
     <string name="settings_license_activity_title">"오픈소스 라이센스"</string>
     <string name="settings_license_activity_unavailable">"라이센스를 로드하는 동안 문제가 발생했습니다."</string>
@@ -521,7 +604,7 @@
     <string name="lockpattern_settings_enable_title">"패턴 필요"</string>
     <string name="lockpattern_settings_enable_summary">"화면 잠금을 해제하려면 패턴을 그려야 함"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title">"패턴 표시"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title">"촉각 피드백 사용"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"의견 수집"</string>
     <string name="lockpattern_settings_choose_lock_pattern">"잠금해제 패턴 설정"</string>
     <string name="lockpattern_settings_change_lock_pattern">"잠금해제 패턴 변경"</string>
     <string name="lockpattern_settings_help_how_to_record">"잠금해제 패턴을 그리는 방법"</string>
@@ -529,10 +612,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"<xliff:g id="NUMBER">%d</xliff:g>초 후에 다시 시도하세요."</string>
     <string name="skip_button_label">"취소"</string>
     <string name="next_button_label">"다음"</string>
-    <string name="lock_title">"전화기 보안 설정"</string>
-    <string name="lock_intro_message"><font size="17">"개인 화면 잠금해제 패턴을 만들어 전화기 무단 사용을 방지합니다. "\n<font height="17">\n</font><b>"1"</b>"  다음 화면에서 패턴을 예를 들어 그리는 동안 지켜봅니다. "\n<font height="17">\n</font><b>"2"</b>"  준비가 되면 사용자만의 개인 잠금해제 패턴을 그립니다. 여러 개의 패턴을 시험해 볼 수 있지만 4개 이상의 점을 연결해야 합니다. "\n<font height="17">\n</font><b>"3"</b>"  패턴을 다시 그려 확인합니다. "\n<font height="17">\n</font><b>"패턴 그리기를 시작하려면 \'다음\'을 선택하세요"</b>". "\n<font height="3">\n</font>"전화기 보호 화면을 설정하지 않으려면 \'취소\'를 선택하세요."</font></string>
+    <string name="lock_title">"휴대폰 보안 설정"</string>
+    <string name="lock_intro_message"><font size="17">"자신만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 전화를 사용하지 못하게 하세요. "\n<font height="17">\n</font><b>"1"</b>"  다음 화면에서 패턴 예가 그려지는 것을 보세요. "\n<font height="17">\n</font><b>"2"</b>" 준비가 되었으면 자신의 잠금해제 패턴을 그리세요. 다른 패턴으로 실험해 볼 수 있습니다. 그러나 최소한 4개의 점을 연결해야 합니다. "\n<font height="17">\n</font><b>"3"</b>" 확인을 위해 자신의 패턴을 다시 그립니다. "\n<font height="17">\n</font><b>"시작할 준비가 되었으면 \'다음\'을 선택합니다"</b>". "\n<font height="3">\n</font>"인증되지 않은 사람도 전화를 사용할 수 있게 하려면 \'취소\'를 선택하세요."</font></string>
     <string name="lock_example_title">"패턴 예"</string>
-    <string name="lock_example_message">"4개 이상의 점을 연결합니다."\n\n"고유한 패턴을 그릴 준비가 되면 \'다음\'을 선택합니다."</string>
+    <string name="lock_example_message">"4개 이상의 점을 연결합니다. "\n" "\n"고유한 패턴을 그릴 준비가 되면 \'다음\'을 선택합니다."</string>
     <string name="manageapplications_settings_title">"응용프로그램 관리"</string>
     <string name="manageapplications_settings_summary">"설치된 응용프로그램 관리 및 제거"</string>
     <string name="applications_settings">"응용프로그램"</string>
@@ -540,7 +623,7 @@
     <string name="applications_settings_header">"응용프로그램 설정"</string>
     <string name="install_applications">"알 수 없는 소스"</string>
     <string name="install_unknown_applications">"시판되지 않은 응용프로그램 설치 허용"</string>
-    <string name="install_all_warning">"전화기 및 개인 정보는 출처를 알 수 없는 응용프로그램의 공격에 더욱 취약합니다. 사용자는 이러한 응용프로그램을 사용하여 발생할 수 있는 전화기 손상이나 데이터 손실에 대해 사용자가 단독으로 책임이 있음을 동의합니다."</string>
+    <string name="install_all_warning">"휴대폰 및 개인 정보는 출처를 알 수 없는 응용프로그램의 공격에 더욱 취약합니다. 사용자는 이러한 응용프로그램을 사용하여 발생할 수 있는 휴대폰 손상이나 데이터 손실에 대해 사용자가 단독으로 책임이 있음을 동의합니다."</string>
     <string name="application_info_label">"응용프로그램 정보"</string>
     <string name="storage_label">"저장공간"</string>
     <string name="auto_launch_label">"기본적으로 시작"</string>
@@ -550,11 +633,13 @@
     <string name="cache_size_label">"캐시"</string>
     <string name="controls_label">"제어"</string>
     <string name="force_stop">"강제 종료"</string>
-    <string name="total_size_label">"총 용량"</string>
+    <string name="total_size_label">"총 시간"</string>
     <string name="application_size_label">"응용프로그램"</string>
     <string name="data_size_label">"데이터"</string>
     <string name="uninstall_text">"제거"</string>
     <string name="clear_user_data_text">"데이터 지우기"</string>
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
     <string name="auto_launch_enable_text">"이 응용프로그램을 해당 작업에 대한 기본 프로그램으로 실행하도록 선택했습니다."</string>
     <string name="auto_launch_disable_text">"기본값이 설정되지 않았습니다."</string>
     <string name="clear_activities">"기본 작업 지우기"</string>
@@ -566,29 +651,39 @@
     <string name="filter_dlg_title">"필터 옵션 선택"</string>
     <string name="filter_apps_all">"모두"</string>
     <string name="filter_apps_third_party">"제3자"</string>
-    <string name="filter_apps_running">"실행 중인 패키지"</string>
+    <string name="filter_apps_running">"실행 중"</string>
     <string name="loading">"로드 중..."</string>
     <string name="recompute_size">"크기 다시 계산 중..."</string>
     <string name="clear_data_dlg_title">"삭제"</string>
     <string name="clear_data_dlg_text">"응용프로그램에 저장한 모든 정보가 영구적으로 삭제됩니다."</string>
     <string name="dlg_ok">"확인"</string>
     <string name="dlg_cancel">"취소"</string>
-    <string name="app_not_found_dlg_title">"응용프로그램 없음"</string>
-    <string name="app_not_found_dlg_text">"설치된 응용프로그램 목록에서 응용프로그램을 찾을 수 없습니다."</string>
+    <string name="app_not_found_dlg_title">"응용프로그램을 찾지 못했습니다."</string>
+    <string name="app_not_found_dlg_text">"응용프로그램이 설치된 응용프로그램 목록에 없습니다."</string>
     <string name="clear_data_failed">"응용프로그램 데이터를 지울 수 없습니다."</string>
-    <string name="security_settings_desc">"이 응용프로그램은 전화기의 다음 항목에 액세스할 수 있습니다."</string>
+    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
+    <skip />
+    <string name="security_settings_desc">"이 응용프로그램은 휴대폰의 다음 항목에 액세스할 수 있습니다."</string>
     <string name="computing_size">"계산 중..."</string>
     <string name="invalid_size_value">"패키지 크기를 계산할 수 없습니다."</string>
-    <string name="empty_list_msg">"타사 응용프로그램이 설치되어 있지 않습니다."</string>
+    <string name="empty_list_msg">"타사 응용프로그램이 설치되지 않습니다."</string>
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
     <string name="language_settings">"로케일 및 텍스트"</string>
     <string name="language_settings_summary">"로케일(언어 및 지역), 텍스트 입력 및 자동 수정 옵션 설정"</string>
     <string name="language_category">"로케일 설정"</string>
     <string name="text_category">"텍스트 설정"</string>
-    <string name="phone_language">"로케일 선택"</string>
+    <string name="phone_language">"언어 선택"</string>
     <string name="phone_language_summary">"언어 및 지역 선택"</string>
     <string name="auto_replace">"자동 바꾸기"</string>
     <string name="auto_replace_summary">"오타 교정"</string>
-    <string name="auto_caps">"자동 대문자 입력"</string>
+    <string name="auto_caps">"자동 대문자 변환"</string>
     <string name="auto_caps_summary">"문장의 첫 글자를 대문자로"</string>
     <string name="auto_punctuate">"자동 구두점 입력"</string>
     <string name="hardkeyboard_category">"물리적 키보드 설정"</string>
@@ -606,16 +701,16 @@
     <string name="user_dict_settings_context_menu_delete_title">"삭제"</string>
     <string name="user_dict_settings_empty_text">"사용자 사전에 단어가 없습니다. 메뉴를 통해 단어를 추가할 수 있습니다."</string>
     <string name="testing">"테스트 중"</string>
-    <string name="testing_phone_info">"전화기 정보"</string>
+    <string name="testing_phone_info">"휴대폰 정보"</string>
     <string name="testing_battery_info">"배터리 정보"</string>
     <string name="testing_battery_history">"배터리 기록"</string>
     <string name="quick_launch_title">"빠른실행"</string>
-    <string name="quick_launch_summary">"응용프로그램을 실행하는 바로가기키 설정"</string>
+    <string name="quick_launch_summary">"응용프로그램을 실행하는 바로가기 설정"</string>
     <string name="quick_launch_assign_application">"응용프로그램 할당"</string>
     <string name="quick_launch_no_shortcut">"바로가기 없음"</string>
     <string name="quick_launch_shortcut">"검색 + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title">"지우기"</string>
-    <string name="quick_launch_clear_dialog_message">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> 바로가기(<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)가 지워집니다."</string>
+    <string name="quick_launch_clear_dialog_message">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>(<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)에 대한 바로가기가 지워집니다."</string>
     <string name="quick_launch_clear_ok_button">"확인"</string>
     <string name="quick_launch_clear_cancel_button">"취소"</string>
     <string name="quick_launch_display_mode_applications">"응용프로그램"</string>
@@ -634,6 +729,10 @@
     <string name="keep_screen_on_summary">"충전하는 동안 화면이 꺼지지 않음"</string>
     <string name="allow_mock_location">"모의 위치 허용"</string>
     <string name="allow_mock_location_summary">"모의 위치 허용"</string>
+    <!-- no translation found for adb_warning_title (1756027479229533250) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (5352555112049663033) -->
+    <skip />
     <string name="gadget_picker_title">"가젯 선택"</string>
     <string name="widget_picker_title">"위젯 선택"</string>
     <string name="battery_history_details_for">"UID %d의 세부정보"</string>
@@ -647,10 +746,14 @@
     <string name="battery_history_system_time">"시스템 시간:"</string>
     <string name="battery_history_total_time">"시간 합계:"</string>
     <string name="battery_history_starts">"시작: <xliff:g id="STARTS">%1$d</xliff:g>번"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g>일, <xliff:g id="HOURS">%2$d</xliff:g>시간, <xliff:g id="MINUTES">%3$d</xliff:g>분, <xliff:g id="SECONDS">%4$d</xliff:g>초"</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g>시간, <xliff:g id="MINUTES">%2$d</xliff:g>분, <xliff:g id="SECONDS">%3$d</xliff:g>초"</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g>분, <xliff:g id="SECONDS">%2$d</xliff:g>초"</string>
-    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g>초"</string>
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
     <string name="battery_history_packages_sharing_this_uid">"이 UID를 공유하는 패키지"</string>
     <string name="battery_history_no_data">"배터리 사용 데이터가 없습니다."</string>
     <string name="battery_history_sensor">"센서:"</string>
@@ -672,4 +775,372 @@
     <string name="app_name_label">"응용프로그램"</string>
     <string name="launch_count_label">"계수"</string>
     <string name="usage_time_label">"사용 시간"</string>
+    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
+    <skip />
+    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
+    <skip />
+    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
+    <skip />
+    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (4630925382578609056) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
+    <skip />
+    <!-- no translation found for usage_name_percent (1899151069711662289) -->
+    <skip />
+    <!-- no translation found for details_title (7564809986329021063) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (2353149143338929583) -->
+    <skip />
+    <!-- no translation found for power_wifi (2382791137776486974) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (7052979399415080971) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
+    <skip />
+    <!-- no translation found for battery_action_display (5302763261448580102) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3003604969548979254) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (1834412555123982714) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for tts_settings (6454363854545277027) -->
+    <skip />
+    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (5064947197040356736) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_demo (405357591189935876) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for gadget_title (7455548605888590466) -->
+    <skip />
+    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
+    <skip />
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
+    <skip />
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
+    <skip />
+    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
+    <skip />
+    <!-- no translation found for vpn_no_button (7620339571187119107) -->
+    <skip />
+    <!-- no translation found for vpn_back_button (192036339792734970) -->
+    <skip />
+    <!-- no translation found for vpn_mistake_button (1759404628590603933) -->
+    <skip />
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <!-- no translation found for vpn_connecting (8039521381692090116) -->
+    <skip />
+    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
+    <skip />
+    <!-- no translation found for vpn_connected (7641723116362845781) -->
+    <skip />
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index e219452..c1135f3 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -32,19 +32,30 @@
     <item>"10 minutter"</item>
     <item>"Aldri slå av"</item>
   </string-array>
-  <string-array name="wifi_security_entries">
-    <item>"Automatisk"</item>
-    <item>"Ingen"</item>
-    <item>"WEP"</item>
-    <item>"WPA personlig"</item>
-    <item>"WPA2 personlig"</item>
-  </string-array>
-  <string-array name="wifi_security_without_auto_entries">
-    <item>"Ingen"</item>
-    <item>"WEP"</item>
-    <item>"WPA personlig"</item>
-    <item>"WPA2 personlig"</item>
-  </string-array>
+    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
+    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
+    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
+    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
+    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
+    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
+    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
+    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
+    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
+    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
+    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
+    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
+    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
+    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
+    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
+    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
+    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
+    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
+    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
+    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
+    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
+    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
+    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
+    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item>"Automatisk"</item>
     <item>"WEP ASCII"</item>
@@ -65,4 +76,15 @@
     <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
     <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
     <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
+    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
+    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
+    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
+    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
+    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
+    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
+    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
+    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index af7bb4c..60f5b12 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -107,7 +107,13 @@
     <string name="date_and_time">"Innstillinger for dato og tid"</string>
     <string name="date_time_12_hour_sample">"1:00 pm"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <!-- no translation found for date_time_changeTime_text (7037437020000867740) -->
+    <skip />
+    <!-- no translation found for date_time_changeDate_text (5259762626498028057) -->
+    <skip />
     <string name="choose_timezone">"Velg tidssone"</string>
+    <!-- no translation found for normal_date_format (1982904221918374153) -->
+    <skip />
     <string name="display_preview_label">"Forhåndsvisning:"</string>
     <string name="display_font_size_label">"Skriftstørrelse:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -188,12 +194,33 @@
     <string name="proxy_settings_label">"Mellomtjener-innstillinger"</string>
     <string name="cancel">"Avbryt"</string>
     <string name="settings_label">"Innstillinger"</string>
+    <!-- no translation found for settings_shortcut (3672145147925639262) -->
+    <skip />
     <string name="airplane_mode">"Flymodus"</string>
     <string name="airplane_mode_summary">"Slå av alle trådløse tilkoblinger"</string>
     <string name="airplane_mode_turning_on">"Slår av trådløse tilkoblinger…"</string>
     <string name="airplane_mode_turning_off">"Slår på trådløse tilkoblinger…"</string>
     <string name="radio_controls_title">"Trådløse nett"</string>
-    <string name="radio_controls_summary">"Trådløse nett, Bluetooth, flymodus mobile nettverk"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
     <string name="date_and_time_settings_title">"Dato og tid"</string>
     <string name="date_and_time_settings_summary">"Sett dato, tid, tidssone og formater"</string>
     <string name="date_time_auto">"Automatisk"</string>
@@ -207,7 +234,8 @@
     <string name="zone_list_menu_sort_alphabetically">"Sorter alfabetisk"</string>
     <string name="zone_list_menu_sort_by_timezone">"Sorter etter tidssone"</string>
     <string name="security_settings_title">"Sikkerhet og plassering"</string>
-    <string name="security_settings_summary">"Plassering, skjermlås, SIM-kort-lås"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"Passord"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Slå på Bluetooth"</string>
@@ -220,6 +248,10 @@
     <string name="bluetooth_error_title">"NB"</string>
     <string name="bluetooth_pairing_error_message">"Det oppsto et problem under paring med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message">"Det oppsto et problem under paring med <xliff:g id="DEVICE_NAME">%1$s</xliff:g> fordi PIN-koden du oppga var feil."</string>
+    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
+    <skip />
     <string name="bluetooth_connecting_error_message">"Kunne ikke koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title">"Let etter enheter"</string>
     <string name="bluetooth_device_context_connect">"Koble til"</string>
@@ -260,11 +292,23 @@
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
+    <skip />
+    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
+    <skip />
     <string name="wifi_security_unknown">"Ukjent"</string>
-    <string name="wifi_security_verbose_open">"Åpent nettverk"</string>
-    <string name="wifi_security_verbose_wep">"Sikret med WEP"</string>
-    <string name="wifi_security_verbose_wpa">"Sikret med WPA"</string>
-    <string name="wifi_security_verbose_wpa2">"Sikret med WPA2"</string>
+    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
+    <skip />
     <string name="ip_address">"IP-adresse"</string>
     <string name="signal">"Signalstyrke"</string>
     <string name="wifi_starting">"Slår på…"</string>
@@ -277,12 +321,27 @@
     <string name="error_saving">"Kunne ikke lagre nettverket"</string>
     <string name="connect">"Koble til"</string>
     <string name="connect_to_blank">"Koble til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for please_select_eap (4488240331626456338) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for please_type_identity (7061261155499513089) -->
+    <skip />
+    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
+    <skip />
+    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
+    <skip />
+    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
+    <skip />
+    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
+    <skip />
     <string name="please_type_passphrase">"Passord for trådløst nettverk"</string>
     <string name="please_type_hex_key">"WEP-nøkkel i hex (0-9, A-F)"</string>
     <string name="wifi_show_password">"Vis passord."</string>
     <string name="scan_wifi">"Søk"</string>
     <string name="summary_not_in_range">"Utenfor rekkevidde"</string>
-    <string name="summary_remembered">"Husket"</string>
+    <!-- no translation found for summary_remembered (6079941090549401742) -->
+    <skip />
     <string name="summary_connection_failed">"Tilkoblingen mislyktes, velg for å prøve på nytt"</string>
     <string name="wifi_access_points">"Trådløse nettverk"</string>
     <string name="wifi_type_ssid">"Nettverks-SSID"</string>
@@ -338,8 +397,7 @@
     <string name="sound_and_display_settings_summary">"Ringetoner, varsling, lysstyrke"</string>
     <string name="silent_mode_title">"Stillemodus"</string>
     <string name="silent_mode_summary">"Slå av alle lyder unntatt media og alarmer"</string>
-    <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
-    <skip />
+    <string name="silent_mode_incl_alarm_summary">"Alle lyder unntatt media og alarmer er slått av"</string>
     <string name="ringtone_title">"Ringetone"</string>
     <string name="ringtone_summary">"Standard ringetone for innkommende anrop"</string>
     <string name="ring_volume_title">"Ringevolum"</string>
@@ -361,16 +419,20 @@
     <string name="sound_effects_enable_summary_on">"Lag lyd under skjermvalg"</string>
     <string name="sound_effects_enable_summary_off">"Lag lyd under skjermvalg"</string>
     <string name="play_media_notification_sounds_enable_title">"Varsling for minnekort"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"Deaktiver varslingslyder for minnekort"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"Aktiver varslingslyder for minnekort"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
+    <skip />
     <string name="sync_settings">"Datasynkronisering"</string>
     <string name="sync_settings_summary">"Applikasjoner som skal synkroniseres"</string>
-    <string name="display_settings">"Skjerminnstillinger"</string>
-    <string name="animations_title">"Animasjon"</string>
-    <!-- no translation found for animations_summary_on (8843613112130484436) -->
+    <!-- no translation found for search_settings (1910951467596035063) -->
     <skip />
-    <!-- no translation found for animations_summary_off (2777026828025551983) -->
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
     <skip />
+    <string name="display_settings">"Skjerminnstillinger"</string>
+    <string name="animations_title">"Animasjon"</string>
+    <string name="animations_summary_on">"Vis animasjon under åpning og lukking av vinduer"</string>
+    <string name="animations_summary_off">"Vis animasjon under åpning og lukking av vinduer"</string>
     <string name="accelerometer_title">"Orientering"</string>
     <string name="accelerometer_summary_on">"Bytt orientering automatisk når telefonen blir snudd"</string>
     <string name="accelerometer_summary_off">"Bytt orientering automatisk når telefonen blir snudd"</string>
@@ -410,10 +472,18 @@
     <string name="device_info_not_available">"Ikke tilgjengelig"</string>
     <string name="device_status_activity_title">"Status"</string>
     <string name="device_status">"Status"</string>
-    <string name="device_status_summary">"IMEI, telefonnummer, signal, osv."</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
     <string name="storage_settings_title">"Minnekort og lagring"</string>
     <string name="storage_settings_summary">"Avmonter minnekort, vis ledig plass"</string>
-    <string name="status_number">"Telefonnummer"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"Nettverkstype"</string>
     <string name="status_data_state">"Datatilgang"</string>
     <string name="status_service_state">"Servicestatus"</string>
@@ -467,9 +537,11 @@
     <string name="restore_default_apn_completed">"Ferdig med å gjenopprette standardvalg for APN"</string>
     <string name="master_clear_title">"Fabrikkinnstillinger"</string>
     <string name="master_clear_summary">"Fjern alle data fra telefonen"</string>
-    <string name="master_clear_desc">"Dette vil nullstille telefonen til fabrikktilstanden, noe som fjerner alle data og nedlastede applikasjoner!"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
     <string name="master_clear_button_text">"Nullstill telefonen"</string>
-    <string name="master_clear_final_desc">"Nullstill telefonen, noe som vil fjerne alle data og applikasjoner? Dette kan ikke gjøres om!"</string>
+    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
+    <skip />
     <string name="master_clear_final_button_text">"Fjern alt"</string>
     <string name="master_clear_gesture_prompt">"Tegn opplåsingsmønsteret"</string>
     <string name="master_clear_gesture_explanation">"Du må tegne opplåsingsmønsteret for å bekrefte nullstilling av telefonen."</string>
@@ -486,13 +558,24 @@
     <string name="call_settings_summary">"Telefonsvarer, viderekobling, samtale venter, nummervisning"</string>
     <string name="network_settings_title">"Mobile nettverk"</string>
     <string name="network_settings_summary">"Innstillinger for roaming, nettverk, APN"</string>
-    <string name="location_title">"Kilder for min plassering"</string>
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
     <string name="location_network_based">"Bruk trådløse nettverk"</string>
     <string name="location_networks_disabled">"Se plassering i applikasjoner (som kart) ved hjelp av trådløse nettverk"</string>
     <string name="location_neighborhood_level">"Plassering bestemmes ved hjelp av trådløse og/eller mobile nettverk"</string>
     <string name="location_gps">"Bruk GPS-satellitter"</string>
     <string name="location_street_level">"Nøyaktig til gatenivå (slå av for å spare batteri)"</string>
     <string name="location_gps_disabled">"Finn plassering på gatenivå (bruker mer batteri, og trenger fri sikt til himmelen)"</string>
+    <!-- no translation found for use_location_title (7585990952633568732) -->
+    <skip />
+    <!-- no translation found for use_location_summary (4411467143899877395) -->
+    <skip />
+    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
+    <skip />
+    <!-- no translation found for agree (6288718671527758326) -->
+    <skip />
+    <!-- no translation found for disagree (6221069272309799230) -->
+    <skip />
     <string name="about_settings">"Om telefonen"</string>
     <string name="about_settings_summary">"Vis juridisk informasjon, telefonstatus, programvareversjon"</string>
     <string name="legal_information">"Juridisk informasjon"</string>
@@ -500,10 +583,9 @@
     <string name="copyright_title">"Opphavsrett"</string>
     <string name="license_title">"Lisens"</string>
     <string name="terms_title">"Betingelser"</string>
-    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
-    <skip />
-    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
     <skip />
+    <string name="system_tutorial_list_item_summary">"Lær å bruke telefonen"</string>
     <string name="settings_license_activity_title">"Åpen kildekode-lisenser"</string>
     <string name="settings_license_activity_unavailable">"Kunne ikke hente lisensene."</string>
     <string name="settings_license_activity_loading">"henter…"</string>
@@ -560,6 +642,8 @@
     <string name="data_size_label">"Data"</string>
     <string name="uninstall_text">"Avinstaller"</string>
     <string name="clear_user_data_text">"Fjern data"</string>
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
     <string name="auto_launch_enable_text">"Du har valgt å starte denne applikasjonen som standard for noen handlinger."</string>
     <string name="auto_launch_disable_text">"Ingen standardvalg satt."</string>
     <string name="clear_activities">"Fjern standardvalg"</string>
@@ -581,10 +665,20 @@
     <string name="app_not_found_dlg_title">"Fant ikke applikasjonen"</string>
     <string name="app_not_found_dlg_text">"Applikasjonen ble ikke funnet i listen av installerte applikasjoner."</string>
     <string name="clear_data_failed">"Kunne ikke fjerne applikasjonadata."</string>
+    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
+    <skip />
     <string name="security_settings_desc">"Applikasjonen har disse rettighetene på telefonen:"</string>
     <string name="computing_size">"Beregner fortsatt…"</string>
     <string name="invalid_size_value">"Kunne ikke beregne pakkestørrelse"</string>
     <string name="empty_list_msg">"Ingen tredjepartsapplikasjoner er installert."</string>
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
     <string name="language_settings">"Språk og tekst"</string>
     <string name="language_settings_summary">"Innstillinger for språk, region, skriving av tekst og feilretting"</string>
     <string name="language_category">"Innstillinger for språk"</string>
@@ -600,8 +694,7 @@
     <string name="auto_punctuate_summary">"Trykk mellomromstasten to ganger for å skrive punktum"</string>
     <string name="show_password">"Synlige passord"</string>
     <string name="show_password_summary">"Vis passord mens de skrives inn"</string>
-    <!-- no translation found for ime_security_warning (3458652708716006477) -->
-    <skip />
+    <string name="ime_security_warning">"Inndatametoden har mulighet til å samle inn all tekst du skriver, inkludert personlige data som passord og kredittkortnummer. Den kommer fra applikasjonen <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Aktiver inndatametoden?"</string>
     <string name="user_dict_settings_titlebar">"Ordliste"</string>
     <string name="user_dict_settings_title">"Ordliste"</string>
     <string name="user_dict_settings_summary">"Legg til og fjern ord fra ordlisten"</string>
@@ -628,8 +721,7 @@
     <string name="quick_launch_display_mode_shortcuts">"Snarveier"</string>
     <string name="input_methods_settings_title">"Skriving av tekst"</string>
     <string name="input_methods_settings_summary">"Innstillinger for skriving av tekst"</string>
-    <!-- no translation found for input_methods_settings_label_format (6002887604815693322) -->
-    <skip />
+    <string name="input_methods_settings_label_format">"Innstillinger for <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="onscreen_keyboard_settings_summary">"Innstillinger for skjermtastatur"</string>
     <string name="builtin_keyboard_settings_title">"Enhetstastatur"</string>
     <string name="builtin_keyboard_settings_summary">"Innstillinger for innebygget tastatur"</string>
@@ -641,6 +733,10 @@
     <string name="keep_screen_on_summary">"Skjermen vil aldri blankes under lading"</string>
     <string name="allow_mock_location">"Tillat manuell plassering"</string>
     <string name="allow_mock_location_summary">"Tillat manuell plassering"</string>
+    <!-- no translation found for adb_warning_title (1756027479229533250) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (5352555112049663033) -->
+    <skip />
     <string name="gadget_picker_title">"Velg gadget"</string>
     <string name="widget_picker_title">"Velg skrivebordselement"</string>
     <string name="battery_history_details_for">"Detaljer for UID %d"</string>
@@ -654,10 +750,14 @@
     <string name="battery_history_system_time">"Systemtid:"</string>
     <string name="battery_history_total_time">"Total tid:"</string>
     <string name="battery_history_starts">"Oppstarter: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> dager, <xliff:g id="HOURS">%2$d</xliff:g> timer, <xliff:g id="MINUTES">%3$d</xliff:g> minutter, <xliff:g id="SECONDS">%4$d</xliff:g> sekunder"</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> timer, <xliff:g id="MINUTES">%2$d</xliff:g> minutter, <xliff:g id="SECONDS">%3$d</xliff:g> sekunder"</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> minutter, <xliff:g id="SECONDS">%2$d</xliff:g> sekunder"</string>
-    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> sekunder"</string>
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
     <string name="battery_history_packages_sharing_this_uid">"Pakker som deler denne UID-en:"</string>
     <string name="battery_history_no_data">"Ingen batterihistorikk tilgjengelig"</string>
     <string name="battery_history_sensor">"Sensor:"</string>
@@ -679,4 +779,372 @@
     <string name="app_name_label">"Applikasjon"</string>
     <string name="launch_count_label">"Antall"</string>
     <string name="usage_time_label">"Brukstid"</string>
+    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
+    <skip />
+    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
+    <skip />
+    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
+    <skip />
+    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (4630925382578609056) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
+    <skip />
+    <!-- no translation found for usage_name_percent (1899151069711662289) -->
+    <skip />
+    <!-- no translation found for details_title (7564809986329021063) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (2353149143338929583) -->
+    <skip />
+    <!-- no translation found for power_wifi (2382791137776486974) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (7052979399415080971) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
+    <skip />
+    <!-- no translation found for battery_action_display (5302763261448580102) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3003604969548979254) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (1834412555123982714) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for tts_settings (6454363854545277027) -->
+    <skip />
+    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (5064947197040356736) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_demo (405357591189935876) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for gadget_title (7455548605888590466) -->
+    <skip />
+    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
+    <skip />
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
+    <skip />
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
+    <skip />
+    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
+    <skip />
+    <!-- no translation found for vpn_no_button (7620339571187119107) -->
+    <skip />
+    <!-- no translation found for vpn_back_button (192036339792734970) -->
+    <skip />
+    <!-- no translation found for vpn_mistake_button (1759404628590603933) -->
+    <skip />
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <!-- no translation found for vpn_connecting (8039521381692090116) -->
+    <skip />
+    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
+    <skip />
+    <!-- no translation found for vpn_connected (7641723116362845781) -->
+    <skip />
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 50a37dd..efb1164 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -32,18 +32,44 @@
     <item>"10 minuten"</item>
     <item>"Nooit time-out"</item>
   </string-array>
+  <string-array name="tts_rate_entries">
+    <item>"Zeer langzaam"</item>
+    <item>"Langzaam"</item>
+    <item>"Normaal"</item>
+    <item>"Snel"</item>
+    <item>"Zeer snel"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item>"Zeer laag"</item>
+    <item>"Laag"</item>
+    <item>"Normaal"</item>
+    <item>"Hoog"</item>
+    <item>"Zeer hoog"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item>"Engels (VS)"</item>
+    <item>"Engels (VK)"</item>
+    <item>"Frans"</item>
+    <item>"Duits"</item>
+    <item>"Italiaans"</item>
+    <item>"Spaans"</item>
+  </string-array>
   <string-array name="wifi_security_entries">
     <item>"Automatisch"</item>
     <item>"Geen"</item>
     <item>"WEP"</item>
     <item>"WPA Personal"</item>
     <item>"WPA2 Personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item>"Geen"</item>
     <item>"WEP"</item>
     <item>"WPA Personal"</item>
     <item>"WPA2 Personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item>"Automatisch"</item>
@@ -73,4 +99,19 @@
     <item>"Aantal keer gestart"</item>
     <item>"Naam van toepassing"</item>
   </string-array>
+  <string-array name="wifi_eap_entries">
+    <item>"PEAP"</item>
+    <item>"TLS"</item>
+    <item>"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item>"Geen"</item>
+    <item>"PAP"</item>
+    <item>"MSCHAP"</item>
+    <item>"MSCHAP2"</item>
+    <item>"GTC"</item>
+  </string-array>
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3a3e40a..24fbd82 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -107,7 +107,10 @@
     <string name="date_and_time">"Datum- en tijdinstellingen"</string>
     <string name="date_time_12_hour_sample">"13:00 uur"</string>
     <string name="date_time_24_hour_sample">"01:00:00 PM"</string>
+    <string name="date_time_changeTime_text">"Tijd wijzigen"</string>
+    <string name="date_time_changeDate_text">"Datum"</string>
     <string name="choose_timezone">"Tijdzone selecteren"</string>
+    <string name="normal_date_format">"Normaal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label">"Voorbeeld:"</string>
     <string name="display_font_size_label">"Lettergrootte:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -188,12 +191,23 @@
     <string name="proxy_settings_label">"Proxy-instellingen"</string>
     <string name="cancel">"Annuleren"</string>
     <string name="settings_label">"Instellingen"</string>
+    <string name="settings_shortcut">"Instellingen"</string>
     <string name="airplane_mode">"Vliegmodus"</string>
     <string name="airplane_mode_summary">"Alle draadloze verbindingen uitschakelen"</string>
     <string name="airplane_mode_turning_on">"Draadloze verbindingen uitschakelen..."</string>
     <string name="airplane_mode_turning_off">"Draadloze verbindingen inschakelen..."</string>
     <string name="radio_controls_title">"Draadloze bedieningselementen"</string>
-    <string name="radio_controls_summary">"Wi-Fi, Bluetooth, vliegmodus en mobiele netwerken beheren"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <string name="roaming">"Gegevensroaming"</string>
+    <string name="roaming_enable">"Verbinding maken met gegevensservices tijdens roaming"</string>
+    <string name="roaming_disable">"Verbinding maken met gegevensservices tijdens roaming"</string>
+    <string name="roaming_reenable_message">"De gegevensverbinding is verbroken, omdat u uw thuisnetwerk heeft verlaten terwijl gegevensroaming was uitgeschakeld."</string>
+    <string name="roaming_turn_it_on_button">"Inschakelen"</string>
+    <string name="roaming_warning">"Gegevensroaming toestaan? Er kunnen hoge roamingkosten in rekening worden gebracht."</string>
+    <string name="roaming_reenable_title">"Let op"</string>
+    <string name="networks">"Operator selecteren"</string>
+    <string name="sum_carrier_select">"Een netwerkoperator selecteren"</string>
     <string name="date_and_time_settings_title">"Datum en tijd"</string>
     <string name="date_and_time_settings_summary">"Datum, tijd, tijdzone en notaties instellen"</string>
     <string name="date_time_auto">"Automatisch"</string>
@@ -207,7 +221,8 @@
     <string name="zone_list_menu_sort_alphabetically">"Alfabetisch sorteren"</string>
     <string name="zone_list_menu_sort_by_timezone">"Sorteren op tijdzone"</string>
     <string name="security_settings_title">"Beveiliging en locatie"</string>
-    <string name="security_settings_summary">"\'Mijn locatie\' instellen, scherm ontgrendelen en SIM-kaart vergrendelen"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"Wachtwoorden"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Bluetooth inschakelen"</string>
@@ -220,6 +235,8 @@
     <string name="bluetooth_error_title">"Let op"</string>
     <string name="bluetooth_pairing_error_message">"Er is een probleem opgetreden bij het koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message">"Er is een probleem opgetreden bij het koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, omdat de opgegeven PIN-code onjuist is."</string>
+    <string name="bluetooth_pairing_device_down_error_message">"Kan niet communiceren met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message">"Koppeling geweigerd door <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message">"Er is een probleem opgetreden bij het verbinden met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title">"Scannen naar apparaten"</string>
     <string name="bluetooth_device_context_connect">"Verbinden"</string>
@@ -260,11 +277,15 @@
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <string name="wifi_security_wpa_eap">"WPA-EAP"</string>
+    <string name="wifi_security_ieee8021x">"IEEE8021X"</string>
     <string name="wifi_security_unknown">"Onbekend"</string>
-    <string name="wifi_security_verbose_open">"Open netwerk"</string>
-    <string name="wifi_security_verbose_wep">"Beveiligd met WEP"</string>
-    <string name="wifi_security_verbose_wpa">"Beveiligd met WPA"</string>
-    <string name="wifi_security_verbose_wpa2">"Beveiligd met WPA2"</string>
+    <string name="wifi_security_verbose_open">"open netwerk"</string>
+    <string name="wifi_security_verbose_wep">"beveiligd met WEP"</string>
+    <string name="wifi_security_verbose_wpa">"beveiligd met WPA"</string>
+    <string name="wifi_security_verbose_wpa2">"beveiligd met WPA2"</string>
+    <string name="wifi_security_verbose_wpa_eap">"beveiligd met WPA-EAP"</string>
+    <string name="wifi_security_verbose_ieee8021x">"beveiligd met IEEE 802.1x"</string>
     <string name="ip_address">"IP-adres"</string>
     <string name="signal">"Signaalsterkte"</string>
     <string name="wifi_starting">"Inschakelen..."</string>
@@ -277,12 +298,19 @@
     <string name="error_saving">"Kan het netwerk niet opslaan"</string>
     <string name="connect">"Verbinden"</string>
     <string name="connect_to_blank">"Verbinding maken met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="please_select_eap">"EAP-methode"</string>
+    <string name="please_select_phase2">"Phase 2-verificatie"</string>
+    <string name="please_type_identity">"Identiteit"</string>
+    <string name="please_type_anonymous_identity">"Anonieme identiteit"</string>
+    <string name="please_select_client_certificate">"Klantcertificaat"</string>
+    <string name="please_select_ca_certificate">"CA-certificaat"</string>
+    <string name="please_type_private_key_passwd">"Wachtwoord voor privésleutel"</string>
     <string name="please_type_passphrase">"Draadloos wachtwoord"</string>
     <string name="please_type_hex_key">"Hexadecimale WEP-sleutel (0-9, A-F)"</string>
     <string name="wifi_show_password">"Wachtwoord weergeven."</string>
     <string name="scan_wifi">"Scannen"</string>
     <string name="summary_not_in_range">"Niet binnen bereik"</string>
-    <string name="summary_remembered">"Onthouden"</string>
+    <string name="summary_remembered">"onthouden"</string>
     <string name="summary_connection_failed">"Verbinding mislukt. Selecteer dit om opnieuw te proberen."</string>
     <string name="wifi_access_points">"Wi-Fi-netwerken"</string>
     <string name="wifi_type_ssid">"SSID van netwerk"</string>
@@ -353,17 +381,20 @@
     <string name="notification_sound_dialog_title">"Beltoon voor meldingen selecteren"</string>
     <string name="media_volume_title">"Mediavolume"</string>
     <string name="media_volume_summary">"Volume voor muziek en video\'s instellen"</string>
-    <string name="dtmf_tone_enable_title">"Hoorbare aanraaktonen"</string>
+    <string name="dtmf_tone_enable_title">"Aanraaktonen"</string>
     <string name="dtmf_tone_enable_summary_on">"Tonen afspelen bij gebruik van toetsenblok"</string>
     <string name="dtmf_tone_enable_summary_off">"Tonen afspelen bij gebruik van toetsenblok"</string>
     <string name="sound_effects_enable_title">"Hoorbare selectie"</string>
     <string name="sound_effects_enable_summary_on">"Geluid afspelen bij schermselectie"</string>
     <string name="sound_effects_enable_summary_off">"Geluid afspelen bij schermselectie"</string>
     <string name="play_media_notification_sounds_enable_title">"SD-kaartmeldingen"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"Geluiden voor SD-kaartmeldingen uitschakelen"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"Geluiden voor SD-kaartmeldingen inschakelen"</string>
+    <string name="play_media_notification_sounds_enable_summary_on">"Geluid afspelen voor SD-kaartmeldingen"</string>
+    <string name="play_media_notification_sounds_enable_summary_off">"Geluid afspelen voor SD-kaartmeldingen"</string>
     <string name="sync_settings">"Gegevenssynchronisatie"</string>
     <string name="sync_settings_summary">"Selecteren welke toepassingen worden gesynchroniseerd"</string>
+    <string name="search_settings">"Zoeken"</string>
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"Instellingen weergeven"</string>
     <string name="animations_title">"Animatie"</string>
     <string name="animations_summary_on">"Animatie weergeven bij het openen en sluiten van vensters"</string>
@@ -407,10 +438,18 @@
     <string name="device_info_not_available">"Niet beschikbaar"</string>
     <string name="device_status_activity_title">"Status"</string>
     <string name="device_status">"Status"</string>
-    <string name="device_status_summary">"IMEI-nummer, telefoonnummer, signaal, enzovoort"</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
     <string name="storage_settings_title">"SD-kaart en telefoongeheugen"</string>
     <string name="storage_settings_summary">"SD-kaart ontkoppelen, beschikbare opslagruimte weergeven"</string>
-    <string name="status_number">"Telefoonnummer"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"Type mobiel netwerk"</string>
     <string name="status_data_state">"Status mobiel netwerk"</string>
     <string name="status_service_state">"Servicestatus"</string>
@@ -464,9 +503,10 @@
     <string name="restore_default_apn_completed">"Herstellen van standaard-APN-instellingen voltooid"</string>
     <string name="master_clear_title">"Terugzetten op fabrieksinstellingen"</string>
     <string name="master_clear_summary">"Hiermee worden alle gegevens op de telefoon gewist"</string>
-    <string name="master_clear_desc">"Met deze actie wordt de telefoon teruggezet op de fabrieksinstellingen. Alle gegevens en gedownloade toepassingen worden gewist!"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
     <string name="master_clear_button_text">"Telefoon opnieuw instellen"</string>
-    <string name="master_clear_final_desc">"Telefoon opnieuw instellen en alle gegevens en toepassingen wissen? Actie kan niet ongedaan worden gemaakt!"</string>
+    <string name="master_clear_final_desc">"Alle persoonlijke gegevens en gedownloade toepassingen wissen? U kunt deze actie niet ongedaan maken."</string>
     <string name="master_clear_final_button_text">"Alles wissen"</string>
     <string name="master_clear_gesture_prompt">"Teken uw ontgrendelingspatroon"</string>
     <string name="master_clear_gesture_explanation">"U moet uw ontgrendelingspatroon tekenen om het opnieuw instellen van de telefoon te bevestigen."</string>
@@ -483,13 +523,18 @@
     <string name="call_settings_summary">"Voicemail, oproepen doorschakelen, wisselgesprek, beller-id instellen"</string>
     <string name="network_settings_title">"Mobiele netwerken"</string>
     <string name="network_settings_summary">"Opties voor roaming, netwerken, APN\'s instellen"</string>
-    <string name="location_title">"Mijn locatiebronnen"</string>
+    <string name="location_title">"Mijn locatie"</string>
     <string name="location_network_based">"Draadloze netwerken gebruiken"</string>
     <string name="location_networks_disabled">"Locatie in toepassingen (zoals Maps) bekijken via draadloze netwerken"</string>
     <string name="location_neighborhood_level">"Locatie bepaald door Wi-Fi en/of mobiele netwerken"</string>
     <string name="location_gps">"GPS-satellieten inschakelen"</string>
-    <string name="location_street_level">"Bij locatie bepalen nauwkeurig tot op straatniveau (deselecteren om acculading te sparen)"</string>
-    <string name="location_gps_disabled">"Locatie bepalen tot op straatniveau (meer stroom nodig en weergave van lucht)"</string>
+    <string name="location_street_level">"Locatie tot op straatniveau (uit om acculading te sparen)"</string>
+    <string name="location_gps_disabled">"Locatie bepalen tot op straatniveau (meer stroom nodig en luchtweergave)"</string>
+    <string name="use_location_title">"Delen met Google"</string>
+    <string name="use_location_summary">"Toestaan dat Google locatie gebruikt voor verbeterde zoekfunctie en andere services"</string>
+    <string name="use_location_warning_message">"Toestaan dat Google locatie gebruikt voor verbeterde zoekresultaten en andere services"</string>
+    <string name="agree">"Akkoord"</string>
+    <string name="disagree">"Niet akkoord"</string>
     <string name="about_settings">"Over de telefoon"</string>
     <string name="about_settings_summary">"Juridische info, telefoonstatus, softwareversie weergeven"</string>
     <string name="legal_information">"Juridische informatie"</string>
@@ -497,7 +542,7 @@
     <string name="copyright_title">"Auteursrecht"</string>
     <string name="license_title">"Licentie"</string>
     <string name="terms_title">"Algemene voorwaarden"</string>
-    <string name="system_tutorial_list_item_title">"Systeemzelfstudie"</string>
+    <string name="system_tutorial_list_item_title">"Systeemhandleiding"</string>
     <string name="system_tutorial_list_item_summary">"Meer informatie over het gebruik van uw telefoon"</string>
     <string name="settings_license_activity_title">"Open-sourcelicenties"</string>
     <string name="settings_license_activity_unavailable">"Er is een probleem bij het laden van de licenties."</string>
@@ -530,7 +575,7 @@
     <string name="skip_button_label">"Annuleren"</string>
     <string name="next_button_label">"Volgende"</string>
     <string name="lock_title">"Uw telefoon beveiligen"</string>
-    <string name="lock_intro_message"><font size="17">"Beveilig uw telefoon tegen ongeoorloofd gebruik door het instellen van een persoonlijk schermontgrendelingspatroon. "\n<font height="17">\n</font><b>"1"</b>"  Op het volgende scherm ziet u hoe een voorbeeldpatroon wordt getekend. "\n<font height="17">\n</font><b>"2"</b>"  Teken uw eigen persoonlijke deblokkeringspatroon als het voorbeeld is voltooid. U kunt verschillende patronen uitproberen, maar u moet minimaal vier punten met elkaar verbinden. "\n<font height="17">\n</font><b>"3"</b>"  Teken uw patroon nogmaals ter bevestiging. "\n<font height="17">\n</font><b>"Bent u er klaar voor? Selecteer \'Volgende\'"</b>". "\n<font height="3">\n</font>"Als u uw telefoon niet wilt beveiligen, selecteert u \'Annuleren\'."</font></string>
+    <string name="lock_intro_message"><font size="17">"Beveilig uw telefoon tegen ongeoorloofd gebruik door het instellen van een persoonlijk schermontgrendelingspatroon. "\n<font height="17">\n</font><b>"1"</b>" Op het volgende scherm ziet u hoe een voorbeeldpatroon wordt getekend. "\n<font height="17">\n</font><b>"2"</b>" Teken uw eigen persoonlijke ontgrendelingspatroon als het voorbeeld is voltooid. U kunt verschillende patronen uitproberen, maar u moet minimaal vier punten met elkaar verbinden. "\n<font height="17">\n</font><b>"3"</b>" Teken uw patroon nogmaals ter bevestiging. "\n<font height="17">\n</font><b>"Bent u er klaar voor? Selecteer \'Volgende\'"</b>". "\n<font height="3">\n</font>"Als u uw telefoon niet wilt beveiligen, selecteert u \'Annuleren\'."</font></string>
     <string name="lock_example_title">"Voorbeeldpatroon"</string>
     <string name="lock_example_message">"Verbind minimaal vier punten. "\n" "\n"Selecteer \'Volgende\' als u klaar bent om uw eigen patroon te tekenen."</string>
     <string name="manageapplications_settings_title">"Toepassingen beheren"</string>
@@ -555,6 +600,7 @@
     <string name="data_size_label">"Gegevens"</string>
     <string name="uninstall_text">"Verwijderen"</string>
     <string name="clear_user_data_text">"Gegevens wissen"</string>
+    <string name="app_factory_reset">"Updates verwijderen"</string>
     <string name="auto_launch_enable_text">"U heeft ervoor gekozen om deze toepassing standaard te starten voor bepaalde acties."</string>
     <string name="auto_launch_disable_text">"Geen standaardwaarden ingesteld."</string>
     <string name="clear_activities">"Standaardwaarden wissen"</string>
@@ -576,10 +622,15 @@
     <string name="app_not_found_dlg_title">"Toepassing niet gevonden"</string>
     <string name="app_not_found_dlg_text">"De toepassing is niet gevonden in de lijst met geïnstalleerde toepassingen."</string>
     <string name="clear_data_failed">"Kan toepassingsgegevens niet wissen."</string>
+    <string name="app_factory_reset_dlg_title">"Updates verwijderen"</string>
+    <string name="app_factory_reset_dlg_text">"Wilt u alle updates voor deze Android-systeemtoepassing verwijderen?"</string>
+    <string name="clear_failed_dlg_title">"Gegevens wissen"</string>
+    <string name="clear_failed_dlg_text">"Het wissen van gegevens is mislukt voor de toepassing"</string>
     <string name="security_settings_desc">"Deze toepassing heeft toegang tot de volgende opties van uw telefoon:"</string>
     <string name="computing_size">"Berekenen…"</string>
     <string name="invalid_size_value">"Kan grootte van pakket niet berekenen"</string>
     <string name="empty_list_msg">"U heeft geen toepassingen van derden geïnstalleerd."</string>
+    <string name="version_text">"versie <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="language_settings">"Landinstelling en tekst"</string>
     <string name="language_settings_summary">"Instellingen voor taal en regio, tekstinvoer en autocorrectieopties opgeven"</string>
     <string name="language_category">"Landinstelling"</string>
@@ -592,13 +643,13 @@
     <string name="auto_caps_summary">"Eerste letters in zinnen met hoofdletter"</string>
     <string name="auto_punctuate">"Automatische interpunctie"</string>
     <string name="hardkeyboard_category">"Instellingen voor vast toetsenbord"</string>
-    <string name="auto_punctuate_summary">"Druk twee keer op de spatiebalk om \'.\' in te voegen"</string>
+    <string name="auto_punctuate_summary">"Druk twee keer op de spatiebalk om een punt (.) in te voegen"</string>
     <string name="show_password">"Zichtbare wachtwoorden"</string>
     <string name="show_password_summary">"Wachtwoord weergeven tijdens het typen"</string>
     <string name="ime_security_warning">"Deze invoermethode verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens zoals wachtwoorden en creditcardnummers. De methode is afkomstig uit de toepassing <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Deze invoermethode inschakelen?"</string>
     <string name="user_dict_settings_titlebar">"Gebruikerswoordenboek"</string>
     <string name="user_dict_settings_title">"Gebruikerswoordenboek"</string>
-    <string name="user_dict_settings_summary">"Woorden toevoegen aan en verwijderen uit gebruikerswoordenboek"</string>
+    <string name="user_dict_settings_summary">"Woorden toevoegen en verwijderen"</string>
     <string name="user_dict_settings_add_menu_title">"Toevoegen"</string>
     <string name="user_dict_settings_add_dialog_title">"Toevoegen aan woordenboek"</string>
     <string name="user_dict_settings_edit_dialog_title">"Woord bewerken"</string>
@@ -634,6 +685,8 @@
     <string name="keep_screen_on_summary">"Scherm gaat nooit uit tijdens het opladen"</string>
     <string name="allow_mock_location">"Neplocaties toestaan"</string>
     <string name="allow_mock_location_summary">"Neplocaties toestaan"</string>
+    <string name="adb_warning_title">"USB-foutopsporing inschakelen?"</string>
+    <string name="adb_warning_message">"USB-foutopsporing is alleen bedoeld voor ontwikkelingsdoeleinden. Het kan worden gebruikt om gegevens te kopiëren tussen uw computer en uw apparaat, om toepassingen zonder melding op uw apparaat te installeren en om loggegevens te lezen."</string>
     <string name="gadget_picker_title">"Gadget kiezen"</string>
     <string name="widget_picker_title">"Widget kiezen"</string>
     <string name="battery_history_details_for">"Details voor UID %d"</string>
@@ -647,10 +700,10 @@
     <string name="battery_history_system_time">"Systeemtijd:"</string>
     <string name="battery_history_total_time">"Totale tijdsduur:"</string>
     <string name="battery_history_starts">"Aantal keren gestart: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> dagen, <xliff:g id="HOURS">%2$d</xliff:g> uur, <xliff:g id="MINUTES">%3$d</xliff:g> minuten, <xliff:g id="SECONDS">%4$d</xliff:g> seconden"</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> uur, <xliff:g id="MINUTES">%2$d</xliff:g> minuten, <xliff:g id="SECONDS">%3$d</xliff:g> seconden"</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> minuten, <xliff:g id="SECONDS">%2$d</xliff:g> seconden"</string>
-    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> seconden"</string>
+    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>u <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
+    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g>u <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
+    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
+    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
     <string name="battery_history_packages_sharing_this_uid">"Pakketten die deze UID delen:"</string>
     <string name="battery_history_no_data">"Er zijn geen beschikbare gebruiksgegevens van de accu"</string>
     <string name="battery_history_sensor">"Sensor:"</string>
@@ -672,4 +725,277 @@
     <string name="app_name_label">"Toepassing"</string>
     <string name="launch_count_label">"Aantal"</string>
     <string name="usage_time_label">"Gebruikstijd"</string>
+    <string name="accessibility_settings_title">"Toegankelijkheid"</string>
+    <string name="accessibility_settings_summary">"Toegankelijkheidsopties beheren"</string>
+    <string name="toggle_accessibility_title">"Toegankelijkheid"</string>
+    <string name="accessibility_services_category">"Toegankelijkheidsservices"</string>
+    <string name="no_accessibility_services_summary">"Geen geïnstalleerde toegankelijkheidsservices."</string>
+    <string name="accessibility_service_security_warning">"Deze toegankelijkheidsservice verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens en creditcardnummers, maar geen wachtwoorden. De service kan ook uw interacties met de gebruikersinterface vastleggen. De service is afkomstig uit de toepassing <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Deze toegankelijkheidsservice inschakelen?"</string>
+    <string name="accessibility_service_disable_warning">"Toegankelijkheid uitschakelen?"</string>
+    <string name="power_usage_summary_title">"Accugebruik"</string>
+    <string name="power_usage_summary">"Waarvoor de accu is gebruikt"</string>
+    <string name="battery_since_unplugged">"Accugebruik sinds losgekoppeld"</string>
+    <string name="battery_since_reset">"Accugebruik sinds herstel"</string>
+    <string name="battery_stats_duration">"<xliff:g id="TIME">%1$s</xliff:g> sinds losgekoppeld"</string>
+    <string name="awake">"Stand-bytijd apparaat"</string>
+    <string name="wifi_on_time">"Tijd Wi-Fi aan"</string>
+    <string name="bluetooth_on_time">"Tijd Wi-Fi aan"</string>
+    <string name="usage_name_percent">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="PERCENT">%2$s</xliff:g>%%"</string>
+    <string name="details_title">"Details over accugebruik"</string>
+    <string name="details_subtitle">"Gebruiksdetails"</string>
+    <string name="controls_subtitle">"Energieverbruik aanpassen"</string>
+    <string name="packages_subtitle">"Bijgeleverde pakketten"</string>
+    <string name="power_screen">"Weergave"</string>
+    <string name="power_wifi">"Wi-Fi"</string>
+    <string name="power_bluetooth">"Bluetooth"</string>
+    <string name="power_cell">"Mobiel stand-by"</string>
+    <string name="power_phone">"Spraakoproepen"</string>
+    <string name="power_idle">"Telefoon inactief"</string>
+    <string name="usage_type_cpu">"CPU-totaal"</string>
+    <string name="usage_type_cpu_foreground">"CPU op voorgrond"</string>
+    <string name="usage_type_gps">"GPS"</string>
+    <string name="usage_type_phone">"Telefoon"</string>
+    <string name="usage_type_data_send">"Gegevens verzonden"</string>
+    <string name="usage_type_data_recv">"Gegevens ontvangen"</string>
+    <string name="usage_type_audio">"Audio"</string>
+    <string name="usage_type_video">"Video"</string>
+    <string name="usage_type_on_time">"Tijd aan"</string>
+    <string name="battery_action_stop">"Gedwongen stoppen"</string>
+    <string name="battery_action_app_details">"Toepassingsinfo"</string>
+    <string name="battery_action_app_settings">"Toepassingsinstellingen"</string>
+    <string name="battery_action_display">"Instellingen weergeven"</string>
+    <string name="battery_action_wifi">"Wi-Fi-instellingen"</string>
+    <string name="battery_action_bluetooth">"Bluetooth-instellingen"</string>
+    <string name="battery_desc_voice">"Accu gebruikt door spraakoproepen"</string>
+    <string name="battery_desc_standby">"Accu gebruikt wanneer telefoon inactief is"</string>
+    <string name="battery_desc_radio">"Accu gebruikt door radio"</string>
+    <string name="battery_sugg_radio">"Schakel over naar de vliegmodus om energie te besparen in gebieden zonder mobiel bereik"</string>
+    <string name="battery_desc_display">"Accu gebruikt door scherm en achtergrondverlichting"</string>
+    <string name="battery_sugg_display">"Verlaag de helderheid van het scherm en/of geef een kortere time-out voor het scherm op"</string>
+    <string name="battery_desc_wifi">"Accu gebruikt door Wi-Fi"</string>
+    <string name="battery_sugg_wifi">"Schakel Wi-Fi uit wanneer u dit niet gebruikt of waar dit niet beschikbaar is"</string>
+    <string name="battery_desc_bluetooth">"Accu gebruikt door Bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic">"Schakel Bluetooth uit wanneer u dit niet gebruikt"</string>
+    <string name="battery_sugg_bluetooth_headset">"Probeer verbinding te maken met een ander Bluetooth-apparaat"</string>
+    <string name="battery_desc_apps">"Accu gebruikt door actieve toepassingen"</string>
+    <string name="battery_sugg_apps_info">"De toepassing stoppen of verwijderen"</string>
+    <string name="battery_sugg_apps_gps">"Schakel GPS uit wanneer u dit niet gebruikt"</string>
+    <string name="battery_sugg_apps_settings">"De toepassing kan instellingen aanbieden om het accugebruik te beperken"</string>
+    <string name="menu_stats_unplugged">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sinds losgekoppeld"</string>
+    <string name="menu_stats_last_unplugged">"Sinds laatst losgekoppeld voor <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total">"Gebruikstotalen"</string>
+    <string name="menu_stats_refresh">"Vernieuwen"</string>
+    <string name="process_kernel_label">"Android-besturingssysteem"</string>
+    <string name="process_mediaserver_label">"Mediaserver"</string>
+    <string name="tts_settings">"Spraaksynthese"</string>
+    <string name="tts_settings_summary">"Opties voor tekst-naar-spraak instellen"</string>
+    <string name="tts_settings_title">"Bedieningselementen voor spraaksynthesizer"</string>
+    <string name="use_default_tts_settings_title">"Altijd mijn instellingen gebruiken"</string>
+    <string name="use_default_tts_settings_summary">"Onderstaande standaardinstellingen overschrijven toepassingsinstellingen"</string>
+    <string name="tts_default_settings_section">"Standaardinstellingen"</string>
+    <string name="tts_default_rate_title">"Spraaksnelheid"</string>
+    <string name="tts_default_rate_summary">"Snelheid waarmee de tekst wordt gesproken"</string>
+    <string name="tts_default_pitch_title">"Hoogte"</string>
+    <string name="tts_default_pitch_summary">"Is van invloed op de toon van de gesproken tekst"</string>
+    <string name="tts_default_lang_title">"Taal"</string>
+    <string name="tts_default_lang_summary">"De taalspecifieke stem voor de gesproken tekst instellen"</string>
+    <string name="tts_play_example_title">"Luisteren naar een voorbeeld"</string>
+    <string name="tts_play_example_summary">"Een korte demonstratie van spraaksynthese afspelen"</string>
+    <string name="tts_install_data_title">"Spraakgegevens installeren"</string>
+    <string name="tts_install_data_summary">"De stemgegevens voor spraaksynthese installeren"</string>
+    <string name="tts_data_installed_summary">"Stemmen die zijn vereist voor spraaksynthese, zijn al correct geïnstalleerd"</string>
+    <string name="tts_demo">"Dit is een voorbeeld van spraaksynthese."</string>
+    <string name="tts_settings_changed_demo">"Uw instellingen zijn gewijzigd. Dit is een voorbeeld van hoe ze klinken."</string>
+    <string name="gadget_title">"Energiebeheer"</string>
+    <string name="vpn_settings_activity_title">"VPN-instellingen"</string>
+    <string name="vpn_connect_to">"Verbinden met %s"</string>
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <string name="vpn_password_colon">"Wachtwoord:"</string>
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <string name="vpn_connect_button">"Verbinden"</string>
+    <string name="vpn_yes_button">"Ja"</string>
+    <string name="vpn_no_button">"Nee"</string>
+    <string name="vpn_back_button">"Terug"</string>
+    <string name="vpn_mistake_button">"Nee, dit is een fout"</string>
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <string name="vpn_connecting">"Verbinding maken..."</string>
+    <string name="vpn_disconnecting">"Verbinding verbreken..."</string>
+    <string name="vpn_connected">"Verbonden"</string>
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <string name="vpn_profile_added">"%s is toegevoegd"</string>
+    <string name="vpn_profile_replaced">"Er zijn wijzigingen aangebracht in %s"</string>
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 025d3f8..50ac86d 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -32,18 +32,44 @@
     <item>"10 minut"</item>
     <item>"Nigdy nie wygaszaj"</item>
   </string-array>
+  <string-array name="tts_rate_entries">
+    <item>"Bardzo wolno"</item>
+    <item>"Wolno"</item>
+    <item>"Normalna"</item>
+    <item>"Szybko"</item>
+    <item>"Bardzo szybko"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item>"Bardzo niskie"</item>
+    <item>"Niskie"</item>
+    <item>"Normalne"</item>
+    <item>"Wysokie"</item>
+    <item>"Bardzo wysokie"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item>"angielski (Stany Zjednoczone)"</item>
+    <item>"angielski (Wielka Brytania)"</item>
+    <item>"francuski"</item>
+    <item>"niemiecki"</item>
+    <item>"Włoski"</item>
+    <item>"hiszpański"</item>
+  </string-array>
   <string-array name="wifi_security_entries">
     <item>"Automatycznie"</item>
     <item>"Brak"</item>
     <item>"WEP"</item>
-    <item>"WPA Personal"</item>
-    <item>"WPA2 Personal"</item>
+    <item>"WPA personal"</item>
+    <item>"WPA2 personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item>"Brak"</item>
     <item>"WEP"</item>
-    <item>"WPA Personal"</item>
-    <item>"WPA2 Personal"</item>
+    <item>"WPA personal"</item>
+    <item>"WPA2 personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item>"Automatycznie"</item>
@@ -73,4 +99,19 @@
     <item>"Licznik uruchomień"</item>
     <item>"Nazwa aplikacji"</item>
   </string-array>
+  <string-array name="wifi_eap_entries">
+    <item>"PEAP"</item>
+    <item>"TLS"</item>
+    <item>"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item>"Brak"</item>
+    <item>"PAP"</item>
+    <item>"MSCHAP"</item>
+    <item>"MSCHAP2"</item>
+    <item>"GTC"</item>
+  </string-array>
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ba3ed98..cbdee07 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -21,7 +21,7 @@
     <string name="turn_on_qxdm">"Włącz dziennik QXDM dla karty SD"</string>
     <string name="turn_off_qxdm">"Wyłącz dziennik QXDM dla karty SD"</string>
     <string name="radioInfo_menu_viewADN">"Wyświetl książkę adresową na karcie SIM"</string>
-    <string name="radioInfo_menu_viewFDN">"Wyświetl ustalone numery (FDN)"</string>
+    <string name="radioInfo_menu_viewFDN">"Wyświetl ustalone numery"</string>
     <string name="radioInfo_menu_viewSDN">"Wyświetl numery usług"</string>
     <string name="radioInfo_menu_getPDP">"Pobierz listę PDP"</string>
     <string name="radioInfo_menu_enableData">"Włącz połączenie danych"</string>
@@ -104,10 +104,13 @@
     <string name="bluetooth_notif_ticker">"Żądanie parowania Bluetooth"</string>
     <string name="bluetooth_notif_title">"Żądanie parowania"</string>
     <string name="bluetooth_notif_message">"Zaznacz, aby sparować "</string>
-    <string name="date_and_time">"Ustawienia daty i czasu"</string>
+    <string name="date_and_time">"Ustawienia daty i godziny"</string>
     <string name="date_time_12_hour_sample">"1:00 (po południu)"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Zmiana godziny"</string>
+    <string name="date_time_changeDate_text">"Data"</string>
     <string name="choose_timezone">"Wybierz strefę czasową"</string>
+    <string name="normal_date_format">"Zwykły (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label">"Podgląd:"</string>
     <string name="display_font_size_label">"Rozmiar czcionki:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -188,26 +191,38 @@
     <string name="proxy_settings_label">"Ustawienia proxy"</string>
     <string name="cancel">"Anuluj"</string>
     <string name="settings_label">"Ustawienia"</string>
+    <string name="settings_shortcut">"Ustawienia"</string>
     <string name="airplane_mode">"Tryb samolotowy"</string>
     <string name="airplane_mode_summary">"Wyłącz wszystkie połączenia bezprzewodowe"</string>
     <string name="airplane_mode_turning_on">"Wyłączanie połączeń bezprzewodowych..."</string>
     <string name="airplane_mode_turning_off">"Włączanie połączeń bezprzewodowych..."</string>
     <string name="radio_controls_title">"Opcje bezprzewodowe"</string>
-    <string name="radio_controls_summary">"Zarządzaj Wi-Fi, Bluetooth, trybem samolotowym i sieciami komórkowymi"</string>
-    <string name="date_and_time_settings_title">"Data i czas"</string>
-    <string name="date_and_time_settings_summary">"Ustaw format daty, czasu i strefę czasową"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <string name="roaming">"Dane w roamingu"</string>
+    <string name="roaming_enable">"Połącz z usługami transmisji danych w roamingu"</string>
+    <string name="roaming_disable">"Połącz z usługami transmisji danych w roamingu"</string>
+    <string name="roaming_reenable_message">"Połączenie transmisji danych zostało utracone, ponieważ opuszczono sieć macierzystą przy wyłączonej opcji danych w roamingu."</string>
+    <string name="roaming_turn_it_on_button">"Włącz"</string>
+    <string name="roaming_warning">"Czy zezwolić na dane w roamingu? Mogą się z tym wiązać wysokie opłaty roamingowe!"</string>
+    <string name="roaming_reenable_title">"Uwaga"</string>
+    <string name="networks">"Wybór operatora"</string>
+    <string name="sum_carrier_select">"Wybierz operatora sieci"</string>
+    <string name="date_and_time_settings_title">"Data i godzina"</string>
+    <string name="date_and_time_settings_summary">"Ustaw format daty, godziny i strefę czasową"</string>
     <string name="date_time_auto">"Automatycznie"</string>
-    <string name="date_time_auto_summaryOn">"Skorzystaj z wartości dostarczonych przez sieć"</string>
-    <string name="date_time_auto_summaryOff">"Skorzystaj z informacji dostarczonych przez operatora"</string>
+    <string name="date_time_auto_summaryOn">"Używaj wartości dostarczonych przez sieć"</string>
+    <string name="date_time_auto_summaryOff">"Używaj informacji dostarczonych przez operatora"</string>
     <string name="date_time_24hour">"Format 24-godzinny"</string>
-    <string name="date_time_set_time">"Ustaw czas"</string>
+    <string name="date_time_set_time">"Ustaw godzinę"</string>
     <string name="date_time_set_timezone">"Wybierz strefę czasową"</string>
     <string name="date_time_set_date">"Ustaw datę"</string>
     <string name="date_time_date_format">"Wybierz format daty"</string>
     <string name="zone_list_menu_sort_alphabetically">"Sortuj alfabetycznie"</string>
     <string name="zone_list_menu_sort_by_timezone">"Sortuj według strefy czasowej"</string>
-    <string name="security_settings_title">"Położenie i zabezpieczenia"</string>
-    <string name="security_settings_summary">"Ustaw Moją lokalizację, blokadę ekranu, blokadę karty SIM"</string>
+    <string name="security_settings_title">"Lokalizacja i blokady"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"Hasła"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Włącz Bluetooth"</string>
@@ -220,6 +235,8 @@
     <string name="bluetooth_error_title">"Uwaga"</string>
     <string name="bluetooth_pairing_error_message">"Wystąpił problem podczas parowania z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_pairing_pin_error_message">"Wystąpił problem podczas parowania z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Wpisany kod PIN jest nieprawidłowy."</string>
+    <string name="bluetooth_pairing_device_down_error_message">"Nie można nawiązać połączenia z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message">"Powiązanie odrzucone przez urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message">"Wystąpił problem podczas łączenia z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_preference_scan_title">"Wyszukaj urządzenia"</string>
     <string name="bluetooth_device_context_connect">"Połącz"</string>
@@ -260,11 +277,15 @@
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <string name="wifi_security_wpa_eap">"WPA-EAP"</string>
+    <string name="wifi_security_ieee8021x">"IEEE8021X"</string>
     <string name="wifi_security_unknown">"Nieznane"</string>
-    <string name="wifi_security_verbose_open">"Sieć otwarta"</string>
-    <string name="wifi_security_verbose_wep">"Zabezpieczona za pomocą WEP"</string>
-    <string name="wifi_security_verbose_wpa">"Zabezpieczona za pomocą WPA"</string>
-    <string name="wifi_security_verbose_wpa2">"Zabezpieczona za pomocą WPA2"</string>
+    <string name="wifi_security_verbose_open">"sieć otwarta"</string>
+    <string name="wifi_security_verbose_wep">"zabezpieczona protokołem WEP"</string>
+    <string name="wifi_security_verbose_wpa">"zabezpieczone protokołem WPA"</string>
+    <string name="wifi_security_verbose_wpa2">"zabezpieczone protokołem WPA2"</string>
+    <string name="wifi_security_verbose_wpa_eap">"zabezpieczone protokołem WPA-EAP"</string>
+    <string name="wifi_security_verbose_ieee8021x">"zabezpieczone protokołem IEEE 802.1x"</string>
     <string name="ip_address">"Adres IP"</string>
     <string name="signal">"Siła sygnału"</string>
     <string name="wifi_starting">"Włączanie..."</string>
@@ -277,12 +298,19 @@
     <string name="error_saving">"Nie można zapisać sieci"</string>
     <string name="connect">"Połącz"</string>
     <string name="connect_to_blank">"Połącz z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="please_select_eap">"Metoda EAP"</string>
+    <string name="please_select_phase2">"Uwierzytelnianie Phase 2"</string>
+    <string name="please_type_identity">"Tożsamość"</string>
+    <string name="please_type_anonymous_identity">"Tożsamość anonimowa"</string>
+    <string name="please_select_client_certificate">"Certyfikat klienta"</string>
+    <string name="please_select_ca_certificate">"Certyfikat urzędu certyfikacji"</string>
+    <string name="please_type_private_key_passwd">"Hasło do klucza prywatnego"</string>
     <string name="please_type_passphrase">"Hasło sieci bezprzewodowej"</string>
     <string name="please_type_hex_key">"Klucz szesnastkowy WEP (0–9, A–F)"</string>
     <string name="wifi_show_password">"Pokaż hasło."</string>
     <string name="scan_wifi">"Przeszukaj"</string>
     <string name="summary_not_in_range">"Poza zasięgiem"</string>
-    <string name="summary_remembered">"Zapamiętane"</string>
+    <string name="summary_remembered">"zapamiętane"</string>
     <string name="summary_connection_failed">"Połączenie nieudane. Wybierz, aby spróbować ponownie"</string>
     <string name="wifi_access_points">"Sieci Wi-Fi"</string>
     <string name="wifi_type_ssid">"Identyfikator SSID sieci"</string>
@@ -290,7 +318,7 @@
     <string name="wifi_save_config">"Zapisz"</string>
     <string name="wifi_password_unchanged">"(niezmienione)"</string>
     <string name="wifi_add_other_network">"Dodaj sieć Wi-Fi"</string>
-    <string name="wifi_notify_open_networks">"Powiadomienie sieciowe"</string>
+    <string name="wifi_notify_open_networks">"Powiadomienie o sieci"</string>
     <string name="wifi_notify_open_networks_summary">"Powiadom mnie, gdy będę w zasięgu otwartej sieci"</string>
     <string name="wifi_password_incorrect_error">"Wprowadzone hasło sieci jest nieprawidłowe. Spróbuj ponownie."</string>
     <string name="wifi_generic_connection_error">"Wystąpił problem podczas łączenia z siecią. Spróbuj ponownie."</string>
@@ -360,10 +388,13 @@
     <string name="sound_effects_enable_summary_on">"Odtwarzaj dźwięk podczas wybierania opcji na ekranie"</string>
     <string name="sound_effects_enable_summary_off">"Odtwarzaj dźwięk podczas wybierania opcji na ekranie"</string>
     <string name="play_media_notification_sounds_enable_title">"Powiadomienia karty SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"Wyłącz dźwięki powiadomień dla karty SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"Włącz dźwięki powiadomień dla karty SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_on">"Odtwarzaj dźwięk dla powiadomień o karcie SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_off">"Odtwarzaj dźwięk dla powiadomień o karcie SD"</string>
     <string name="sync_settings">"Synchronizacja danych"</string>
     <string name="sync_settings_summary">"Wybierz, które aplikacje są synchronizowane"</string>
+    <string name="search_settings">"Szukaj"</string>
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"Ustawienia wyświetlacza"</string>
     <string name="animations_title">"Animacja"</string>
     <string name="animations_summary_on">"Pokaż animację przy otwieraniu i zamykaniu okien"</string>
@@ -401,16 +432,24 @@
     <string name="system_update_settings_list_item_summary">"Sprawdź aktualizacje systemu"</string>
     <string name="firmware_version">"Wersja oprogramowania"</string>
     <string name="model_number">"Numer modelu"</string>
-    <string name="baseband_version">"Pasmo podstawowe"</string>
+    <string name="baseband_version">"Wersja pasma podstawowego"</string>
     <string name="kernel_version">"Wersja jądra"</string>
-    <string name="build_number">"Numer wersji"</string>
+    <string name="build_number">"Numer kompilacji"</string>
     <string name="device_info_not_available">"Niedostępna"</string>
     <string name="device_status_activity_title">"Informacje o telefonie"</string>
     <string name="device_status">"Informacje o telefonie"</string>
-    <string name="device_status_summary">"IMEI, numer telefonu, sygnał itp."</string>
-    <string name="storage_settings_title">"Karta SD i pamięć telefonu"</string>
-    <string name="storage_settings_summary">"Odłącz kartę SD, pokaż ilość dostępnej pamięci"</string>
-    <string name="status_number">"Numer telefonu"</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
+    <string name="storage_settings_title">"Karta SD i pamięć"</string>
+    <string name="storage_settings_summary">"Odłącz kartę SD, pokaż ilość dostępnej pamięci w telefonie"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"Typ sieci komórkowej"</string>
     <string name="status_data_state">"Stan sieci komórkowej"</string>
     <string name="status_service_state">"Stan usługi"</string>
@@ -425,9 +464,9 @@
     <string name="internal_memory">"Pamięć wewnętrzna telefonu"</string>
     <string name="sd_memory">"Karta SD"</string>
     <string name="memory_available">"Dostępne miejsce"</string>
-    <string name="memory_size">"Łączna pojemność"</string>
-    <string name="sd_eject">"Odmontuj kartę SD"</string>
-    <string name="sd_eject_summary">"Odmontuj kartę SD, aby bezpiecznie ją usunąć"</string>
+    <string name="memory_size">"Całkowita pojemność"</string>
+    <string name="sd_eject">"Odłącz kartę SD"</string>
+    <string name="sd_eject_summary">"Odłącz kartę SD, aby bezpiecznie ją usunąć"</string>
     <string name="sd_format">"Formatuj kartę SD"</string>
     <string name="sd_format_summary">"Formatuj (wymaż) kartę SD"</string>
     <string name="sd_unavailable">"Niedostępna"</string>
@@ -464,9 +503,10 @@
     <string name="restore_default_apn_completed">"Zakończono resetowanie domyślnych ustawień APN"</string>
     <string name="master_clear_title">"Ustawienia fabryczne"</string>
     <string name="master_clear_summary">"Wymazuje wszystkie dane w telefonie"</string>
-    <string name="master_clear_desc">"Ta czynność spowoduje przywrócenie w telefonie ustawień fabrycznych i wymazanie wszystkich danych oraz pobranych aplikacji!"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
     <string name="master_clear_button_text">"Resetuj telefon"</string>
-    <string name="master_clear_final_desc">"Zresetować telefon, wymazując wszystkie dane i aplikacje? Działania nie można cofnąć!"</string>
+    <string name="master_clear_final_desc">"Czy usunąć wszystkie informacje osobiste i wszystkie pobrane aplikacje? Tej operacji nie można cofnąć!"</string>
     <string name="master_clear_final_button_text">"Wymaż wszystko"</string>
     <string name="master_clear_gesture_prompt">"Narysuj wzór odblokowania"</string>
     <string name="master_clear_gesture_explanation">"Aby potwierdzić resetowanie telefonu, musisz narysować swój wzór odblokowania."</string>
@@ -477,19 +517,24 @@
     <string name="media_format_button_text">"Formatuj kartę SD"</string>
     <string name="media_format_final_desc">"Czy sformatować kartę SD i wymazać wszystkie multimedia? Nie można cofnąć tej akcji!"</string>
     <string name="media_format_final_button_text">"Wymaż wszystko"</string>
-    <string name="media_format_gesture_prompt">"Narysuj wzorzec odblokowania"</string>
-    <string name="media_format_gesture_explanation">"Aby potwierdzić formatowanie karty SD, należy narysować swój wzorzec do odblokowania."</string>
+    <string name="media_format_gesture_prompt">"Narysuj wzór odblokowania"</string>
+    <string name="media_format_gesture_explanation">"Aby potwierdzić formatowanie karty SD, należy narysować swój wzór odblokowania."</string>
     <string name="call_settings_title">"Ustawienia połączeń"</string>
-    <string name="call_settings_summary">"Poczta głosowa, przekierowania połączeń, poł. oczekujące, ID dzwoniącego"</string>
+    <string name="call_settings_summary">"Poczta głosowa, przekierowania połączeń, poł. oczekujące, ID rozmówcy"</string>
     <string name="network_settings_title">"Sieci komórkowe"</string>
     <string name="network_settings_summary">"Ustaw opcje roamingu, sieci, nazw APN"</string>
-    <string name="location_title">"Źródło Mojej lokalizacji"</string>
+    <string name="location_title">"Moja lokalizacja"</string>
     <string name="location_network_based">"Użyj sieci Wi-Fi"</string>
-    <string name="location_networks_disabled">"Zobacz położenie w aplikacjach (takich jak Mapy), korzystając z sieci bezprzewodowych"</string>
-    <string name="location_neighborhood_level">"Położenie określane jest za pomocą Wi-Fi i/lub sieci komórkowych."</string>
+    <string name="location_networks_disabled">"Określ moją lokalizację w aplikacjach (takich jak Mapy), korzystając z sieci bezprzewodowych"</string>
+    <string name="location_neighborhood_level">"Lokalizacja określana jest za pomocą Wi-Fi i/lub sieci komórkowych"</string>
     <string name="location_gps">"Użyj satelit GPS"</string>
     <string name="location_street_level">"Ustalanie położenia z dokładnością do ulicy (wyłącz, aby oszczędzać baterię)"</string>
     <string name="location_gps_disabled">"Podaje dokładne położenie (zużywa więcej baterii, działa na zewnątrz)"</string>
+    <string name="use_location_title">"Udostępnij dla Google"</string>
+    <string name="use_location_summary">"Zezwalaj Google na korzystanie z danych o lokalizacji w celu polepszenia wyszukiwania oraz innych usług"</string>
+    <string name="use_location_warning_message">"Zezwalaj Google na korzystanie z danych o lokalizacji w celu polepszenia wyników wyszukiwania oraz innych usług"</string>
+    <string name="agree">"Zgadzam się"</string>
+    <string name="disagree">"Nie zgadzam się"</string>
     <string name="about_settings">"Informacje o telefonie"</string>
     <string name="about_settings_summary">"Wyświetl informacje prawne, stan telefonu, wersję oprogramowania"</string>
     <string name="legal_information">"Informacje prawne"</string>
@@ -530,7 +575,7 @@
     <string name="skip_button_label">"Anuluj"</string>
     <string name="next_button_label">"Dalej"</string>
     <string name="lock_title">"Zabezpieczanie telefonu"</string>
-    <string name="lock_intro_message"><font size="17">"Chroń swój telefon przed nieuprawnionym użyciem przez stworzenie osobistego wzoru odblokowania ekranu. "\n<font height="17">\n</font><b>"1"</b>" Obejrzyj rysowanie przykładowego wzoru na następnym ekranie. "\n<font height="17">\n</font><b>"2"</b>" Następnie narysuj swój własny wzór odblokowania. Eksperymentuj z różnymi wzorami, ale połącz co najmniej 4 punkty. "\n<font height="17">\n</font><b>"3"</b>" Narysuj swój wzór ponownie dla potwierdzenia. "\n<font height="17">\n</font><b>"Możemy zaczynać? Wybierz „Dalej”"</b>". "\n<font height="3">\n</font>"Aby zrezygnować z ustawiania blokady, wybierz „Anuluj”."</font></string>
+    <string name="lock_intro_message"><font size="17">"Chroń swój telefon przed nieuprawnionym użyciem przez utworzenie osobistego wzoru odblokowania ekranu. "\n<font height="17">\n</font><b>"1"</b>" Obejrzyj rysowanie przykładowego wzoru na następnym ekranie. "\n<font height="17">\n</font><b>"2"</b>" Następnie narysuj swój własny wzór odblokowania. Eksperymentuj z różnymi wzorami, ale połącz co najmniej cztery punkty. "\n<font height="17">\n</font><b>"3"</b>" Narysuj swój wzór ponownie dla potwierdzenia. "\n<font height="17">\n</font><b>"Możemy zaczynać? Wybierz „Dalej”"</b>". "\n<font height="3">\n</font>"Aby zrezygnować z ustawiania blokady, wybierz „Anuluj”."</font></string>
     <string name="lock_example_title">"Przykładowy wzór"</string>
     <string name="lock_example_message">"Połącz co najmniej cztery kropki."\n" "\n"Wybierz polecenie „Dalej”, aby narysować własny wzór."</string>
     <string name="manageapplications_settings_title">"Zarządzaj aplikacjami"</string>
@@ -555,6 +600,7 @@
     <string name="data_size_label">"Dane"</string>
     <string name="uninstall_text">"Odinstaluj"</string>
     <string name="clear_user_data_text">"Wyczyść dane"</string>
+    <string name="app_factory_reset">"Odinstaluj aktualizacje"</string>
     <string name="auto_launch_enable_text">"Wybrano domyślne uruchamianie tej aplikacji dla niektórych czynności."</string>
     <string name="auto_launch_disable_text">"Brak ustawień domyślnych."</string>
     <string name="clear_activities">"Wyczyść domyślne"</string>
@@ -576,10 +622,15 @@
     <string name="app_not_found_dlg_title">"Nie znaleziono aplikacji"</string>
     <string name="app_not_found_dlg_text">"Program nie został znaleziony na liście zainstalowanych aplikacji."</string>
     <string name="clear_data_failed">"Nie można wyczyścić danych aplikacji."</string>
+    <string name="app_factory_reset_dlg_title">"Odinstaluj aktualizacje"</string>
+    <string name="app_factory_reset_dlg_text">"Czy chcesz odinstalować wszystkie aktualizacje tej aplikacji systemu Android?"</string>
+    <string name="clear_failed_dlg_title">"Wyczyść dane"</string>
+    <string name="clear_failed_dlg_text">"Wyczyszczenie danych aplikacji nie powiodło się"</string>
     <string name="security_settings_desc">"Ta aplikacja ma dostęp do następujących funkcji telefonu:"</string>
     <string name="computing_size">"Przetwarzanie..."</string>
     <string name="invalid_size_value">"Nie można obliczyć rozmiaru pakietu"</string>
     <string name="empty_list_msg">"Nie zainstalowano żadnych aplikacji innych firm."</string>
+    <string name="version_text">"wersja <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="language_settings">"Regionalne i język"</string>
     <string name="language_settings_summary">"Określ ustawienia regionalne (język i region) oraz opcje wprowadzania tekstu i autokorekty"</string>
     <string name="language_category">"Ustawienia regionalne"</string>
@@ -589,10 +640,10 @@
     <string name="auto_replace">"Autokorekta"</string>
     <string name="auto_replace_summary">"Poprawiaj błędnie wpisane słowa"</string>
     <string name="auto_caps">"Wielka litera po kropce"</string>
-    <string name="auto_caps_summary">"Zdanie zaczynaj wielką literą"</string>
+    <string name="auto_caps_summary">"Zaczynaj zdania wielką literą"</string>
     <string name="auto_punctuate">"Łatwa interpunkcja"</string>
     <string name="hardkeyboard_category">"Ustawienia klawiatury fizycznej"</string>
-    <string name="auto_punctuate_summary">"Naciśnij klawisz spacji dwukrotnie, aby wstawić kropkę."</string>
+    <string name="auto_punctuate_summary">"Naciśnij dwukrotnie klawisz spacji, aby wstawić kropkę"</string>
     <string name="show_password">"Widoczne hasła"</string>
     <string name="show_password_summary">"Pokazuj hasło podczas wpisywania"</string>
     <string name="ime_security_warning">"Ta metoda wprowadzania może gromadzić cały wpisywany tekst, w tym dane osobiste, takie jak hasła i numery kart kredytowych. Ta metoda pochodzi z aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Włączyć tę metodę wprowadzania?"</string>
@@ -626,7 +677,7 @@
     <string name="onscreen_keyboard_settings_summary">"Ustawienia klawiatury ekranowej"</string>
     <string name="builtin_keyboard_settings_title">"Klawiatura urządzenia"</string>
     <string name="builtin_keyboard_settings_summary">"Ustawienia klawiatury wbudowanej"</string>
-    <string name="development_settings_title">"Programowanie"</string>
+    <string name="development_settings_title">"Dla programistów"</string>
     <string name="development_settings_summary">"Ustaw opcje związane z programowaniem aplikacji"</string>
     <string name="enable_adb">"Debugowanie USB"</string>
     <string name="enable_adb_summary">"Tryb debugowania, gdy podłączone jest USB"</string>
@@ -634,6 +685,8 @@
     <string name="keep_screen_on_summary">"Ekran nigdy nie będzie gaszony podczas ładowania"</string>
     <string name="allow_mock_location">"Pozorowanie położenia"</string>
     <string name="allow_mock_location_summary">"Zezwalaj na pozorowane położenia"</string>
+    <string name="adb_warning_title">"Czy włączyć debugowanie USB?"</string>
+    <string name="adb_warning_message">"Debugowanie USB jest przeznaczone wyłącznie do celów programistycznych. Może posłużyć do kopiowania danych między komputerem a urządzeniem, instalowania aplikacji w urządzeniu bez powiadamiania, a także odczytywania danych dziennika."</string>
     <string name="gadget_picker_title">"Wybierz gadżet"</string>
     <string name="widget_picker_title">"Wybierz widżet"</string>
     <string name="battery_history_details_for">"Szczegóły dla identyfikatora UID %d"</string>
@@ -672,4 +725,277 @@
     <string name="app_name_label">"Aplikacja"</string>
     <string name="launch_count_label">"Licznik"</string>
     <string name="usage_time_label">"Czas użycia"</string>
+    <string name="accessibility_settings_title">"Ułatwienia dostępu"</string>
+    <string name="accessibility_settings_summary">"Zarządzaj opcjami ułatwień dostępu"</string>
+    <string name="toggle_accessibility_title">"Ułatwienia dostępu"</string>
+    <string name="accessibility_services_category">"Usługi ułatwień dostępu"</string>
+    <string name="no_accessibility_services_summary">"Brak zainstalowanych usług ułatwień dostępu."</string>
+    <string name="accessibility_service_security_warning">"Ta usługa ułatwień dostępu może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci numerów kart kredytowych, ale z wyłączeniem haseł. Może również śledzić działania w interfejsie użytkownika. Usługa pochodzi z aplikacji <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Czy włączyć tę usługę ułatwień dostępu?"</string>
+    <string name="accessibility_service_disable_warning">"Czy wyłączyć ułatwienia dostępu?"</string>
+    <string name="power_usage_summary_title">"Użycie baterii"</string>
+    <string name="power_usage_summary">"Gdzie wykorzystywana jest bateria"</string>
+    <string name="battery_since_unplugged">"Użycie baterii od odłączenia"</string>
+    <string name="battery_since_reset">"Użycie baterii od zresetowania"</string>
+    <string name="battery_stats_duration">"<xliff:g id="TIME">%1$s</xliff:g> od odłączenia"</string>
+    <string name="awake">"Czas aktywności urządzenia"</string>
+    <string name="wifi_on_time">"WiFi na czas"</string>
+    <string name="bluetooth_on_time">"WiFi na czas"</string>
+    <string name="usage_name_percent">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="PERCENT">%2$s</xliff:g>%%"</string>
+    <string name="details_title">"Szczegóły użycia baterii"</string>
+    <string name="details_subtitle">"Szczegóły użycia"</string>
+    <string name="controls_subtitle">"Dostosuj wykorzystanie energii"</string>
+    <string name="packages_subtitle">"Dołączone pakiety"</string>
+    <string name="power_screen">"Wyświetlacz"</string>
+    <string name="power_wifi">"Wi-Fi"</string>
+    <string name="power_bluetooth">"Bluetooth"</string>
+    <string name="power_cell">"Komórka w trybie gotowości"</string>
+    <string name="power_phone">"Połączenia głosowe"</string>
+    <string name="power_idle">"Telefon nieaktywny"</string>
+    <string name="usage_type_cpu">"Łącznie dla procesora"</string>
+    <string name="usage_type_cpu_foreground">"Procesor w działaniach pierwszoplanowych"</string>
+    <string name="usage_type_gps">"GPS"</string>
+    <string name="usage_type_phone">"Telefon"</string>
+    <string name="usage_type_data_send">"Dane wysłane"</string>
+    <string name="usage_type_data_recv">"Dane odebrane"</string>
+    <string name="usage_type_audio">"Dźwięk"</string>
+    <string name="usage_type_video">"Wideo"</string>
+    <string name="usage_type_on_time">"Czas włączenia"</string>
+    <string name="battery_action_stop">"Wymuś zatrzymanie"</string>
+    <string name="battery_action_app_details">"Informacje o aplikacji"</string>
+    <string name="battery_action_app_settings">"Ustawienia aplikacji"</string>
+    <string name="battery_action_display">"Ustawienia wyświetlacza"</string>
+    <string name="battery_action_wifi">"Ustawienia WiFi"</string>
+    <string name="battery_action_bluetooth">"Ustawienia Bluetooth"</string>
+    <string name="battery_desc_voice">"Użycie baterii przez połączenia głosowe"</string>
+    <string name="battery_desc_standby">"Użycie baterii przy nieaktywnym telefonie"</string>
+    <string name="battery_desc_radio">"Użycie baterii przez radio komórkowe"</string>
+    <string name="battery_sugg_radio">"Przełącz w tryb samolotowy na obszarach bez zasięgu sieci komórkowych, aby oszczędzać energię"</string>
+    <string name="battery_desc_display">"Użycie baterii przez wyświetlacz i podświetlenie"</string>
+    <string name="battery_sugg_display">"Zmniejsz jasność ekranu i/lub czas jego wygaszania"</string>
+    <string name="battery_desc_wifi">"Użycie baterii przez Wi-Fi"</string>
+    <string name="battery_sugg_wifi">"Wyłącz WiFi, gdy nie jest używane i w miejscach, gdzie nie jest dostępne"</string>
+    <string name="battery_desc_bluetooth">"Użycie baterii przez bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic">"Wyłącz bluetooth, gdy nie jest używany"</string>
+    <string name="battery_sugg_bluetooth_headset">"Spróbuj połączyć się z innym urządzeniem bluetooth"</string>
+    <string name="battery_desc_apps">"Użycie baterii przez działające aplikacje"</string>
+    <string name="battery_sugg_apps_info">"Zatrzymaj lub odinstaluj aplikację"</string>
+    <string name="battery_sugg_apps_gps">"Wyłącz GPS, gdy nie jest używany"</string>
+    <string name="battery_sugg_apps_settings">"Aplikacja może oferować ustawienia pozwalające zredukować użycie baterii"</string>
+    <string name="menu_stats_unplugged">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odłączenia"</string>
+    <string name="menu_stats_last_unplugged">"Ostatnio odłączony na <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total">"Łączne użycie"</string>
+    <string name="menu_stats_refresh">"Odśwież"</string>
+    <string name="process_kernel_label">"System operacyjny Android"</string>
+    <string name="process_mediaserver_label">"Serwer mediów"</string>
+    <string name="tts_settings">"Synteza mowy"</string>
+    <string name="tts_settings_summary">"Ustaw opcje zamiany tekstu na mowę"</string>
+    <string name="tts_settings_title">"Sterowanie syntezatorem mowy"</string>
+    <string name="use_default_tts_settings_title">"Zawsze używaj moich ustawień"</string>
+    <string name="use_default_tts_settings_summary">"Poniższe ustawienia domyślne zastępują ustawienia aplikacji"</string>
+    <string name="tts_default_settings_section">"Ustawienia domyślne"</string>
+    <string name="tts_default_rate_title">"Szybkość mowy"</string>
+    <string name="tts_default_rate_summary">"Szybkość czytania tekstu"</string>
+    <string name="tts_default_pitch_title">"Tony"</string>
+    <string name="tts_default_pitch_summary">"Określa ton czytanego tekstu"</string>
+    <string name="tts_default_lang_title">"Język"</string>
+    <string name="tts_default_lang_summary">"Ustawia zależny od języka głos dla czytanych tekstów"</string>
+    <string name="tts_play_example_title">"Posłuchaj przykładu"</string>
+    <string name="tts_play_example_summary">"Odtwórz krótką prezentację syntezy mowy"</string>
+    <string name="tts_install_data_title">"Zainstaluj dane głosowe"</string>
+    <string name="tts_install_data_summary">"Zainstaluj dane głosowe wymagane dla syntezy mowy"</string>
+    <string name="tts_data_installed_summary">"Dane głosowe wymagane dla syntezy mowy zostały już poprawnie zainstalowane"</string>
+    <string name="tts_demo">"To jest przykład syntezy mowy."</string>
+    <string name="tts_settings_changed_demo">"Ustawienia zostały zmienione. Oto przykład aktualnie skonfigurowanego brzmienia."</string>
+    <string name="gadget_title">"Zarządzanie energią"</string>
+    <string name="vpn_settings_activity_title">"Ustawienia sieci VPN"</string>
+    <string name="vpn_connect_to">"Połącz z %s"</string>
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <string name="vpn_password_colon">"Hasło:"</string>
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <string name="vpn_connect_button">"Połącz"</string>
+    <string name="vpn_yes_button">"Tak"</string>
+    <string name="vpn_no_button">"Nie"</string>
+    <string name="vpn_back_button">"Wstecz"</string>
+    <string name="vpn_mistake_button">"Nie, to pomyłka"</string>
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <string name="vpn_connecting">"Łączenie..."</string>
+    <string name="vpn_disconnecting">"Rozłączanie..."</string>
+    <string name="vpn_connected">"Połączone"</string>
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <string name="vpn_profile_added">"Dodano: %s"</string>
+    <string name="vpn_profile_replaced">"Wprowadzanie zmian w %s"</string>
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-nokeys/strings.xml b/res/values-pt-nokeys/strings.xml
new file mode 100644
index 0000000..e05a05c
--- /dev/null
+++ b/res/values-pt-nokeys/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary">"Gerenciar aplicativos"</string>
+</resources>
diff --git a/res/values-pt-rPT-nokeys/strings.xml b/res/values-pt-rPT-nokeys/strings.xml
new file mode 100644
index 0000000..75e20d1
--- /dev/null
+++ b/res/values-pt-rPT-nokeys/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary">"Gerir aplicações"</string>
+</resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
new file mode 100644
index 0000000..0bc4fff
--- /dev/null
+++ b/res/values-pt-rPT/arrays.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item>"América"</item>
+    <item>"Europa"</item>
+    <item>"África"</item>
+    <item>"Ásia"</item>
+    <item>"Austrália"</item>
+    <item>"Pacífico"</item>
+    <item>"Todas"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item>"15 segundos"</item>
+    <item>"30 segundos"</item>
+    <item>"1 minuto"</item>
+    <item>"2 minutos"</item>
+    <item>"10 minutos"</item>
+    <item>"Nunca esgotar tempo"</item>
+  </string-array>
+    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
+    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
+    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
+    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
+    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
+    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
+    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
+    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
+    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
+    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
+    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
+    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
+    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
+    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
+    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
+    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
+    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
+    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
+    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
+    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
+    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
+    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
+    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
+    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
+  <string-array name="wifi_wep_type">
+    <item>"Automático"</item>
+    <item>"WEP ASCII"</item>
+    <item>"WEP hexadecimal"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries">
+    <item>"Ao desligar o ecrã"</item>
+    <item>"Nunca quando ligado"</item>
+    <item>"Nunca"</item>
+  </string-array>
+  <string-array name="battery_history_type_spinner">
+    <item>"Utilização da CPU"</item>
+    <item>"Utilização da rede"</item>
+    <item>"Utilização do GPS"</item>
+    <item>"Utilização do sensor"</item>
+    <item>"Utilização para reactivação parcial"</item>
+    <item>"Outra utilização"</item>
+  </string-array>
+  <string-array name="battery_history_which_spinner">
+    <item>"Desde a última vez que foi desligado"</item>
+    <item>"Total desde o arranque"</item>
+    <item>"Total em todo o tempo"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item>"Tempo de utilização"</item>
+    <item>"Total de inícios"</item>
+    <item>"Nome da aplicação"</item>
+  </string-array>
+    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
+    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
+    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
+    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
+    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
+    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
+    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
+    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..a3acade
--- /dev/null
+++ b/res/values-pt-rPT/strings.xml
@@ -0,0 +1,1146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="device_info_default">"Desconhecido"</string>
+    <string name="turn_on_radio">"Ligar rádio"</string>
+    <string name="turn_off_radio">"Desligar rádio"</string>
+    <string name="turn_on_qxdm">"Activar registo QXDM do SD"</string>
+    <string name="turn_off_qxdm">"Desactivar registo QXDM do SD"</string>
+    <string name="radioInfo_menu_viewADN">"Ver livro de endereços do SIM"</string>
+    <string name="radioInfo_menu_viewFDN">"Ver números de marcação fixos"</string>
+    <string name="radioInfo_menu_viewSDN">"Ver números de marcação de serviços"</string>
+    <string name="radioInfo_menu_getPDP">"Obter lista de PDP"</string>
+    <string name="radioInfo_menu_enableData">"Activar ligação de dados"</string>
+    <string name="radioInfo_menu_disableData">"Desactivar ligação de dados"</string>
+    <string name="radioInfo_menu_enableDataOnBoot">"Activar dados no arranque"</string>
+    <string name="radioInfo_menu_disableDataOnBoot">"Desactivar dados no arranque"</string>
+    <string name="radioInfo_service_in">"Em serviço"</string>
+    <string name="radioInfo_service_out">"Fora de serviço"</string>
+    <string name="radioInfo_service_emergency">"Apenas chamadas de emergência"</string>
+    <string name="radioInfo_service_off">"Rádio desligado"</string>
+    <string name="radioInfo_roaming_in">"Roaming"</string>
+    <string name="radioInfo_roaming_not">"Sem roaming"</string>
+    <string name="radioInfo_phone_idle">"Inactivo"</string>
+    <string name="radioInfo_phone_ringing">"A tocar"</string>
+    <string name="radioInfo_phone_offhook">"Chamada em curso"</string>
+    <string name="radioInfo_data_disconnected">"Desligado"</string>
+    <string name="radioInfo_data_connecting">"A ligar"</string>
+    <string name="radioInfo_data_connected">"Ligado"</string>
+    <string name="radioInfo_data_suspended">"Suspenso"</string>
+    <string name="radioInfo_unknown">"desconhecido"</string>
+    <string name="radioInfo_display_packets">"pcts"</string>
+    <string name="radioInfo_display_bytes">"bytes"</string>
+    <string name="radioInfo_display_dbm">"dBm"</string>
+    <string name="radioInfo_display_asu">"asu"</string>
+    <string name="radioInfo_lac">"LAC"</string>
+    <string name="radioInfo_cid">"CID"</string>
+    <string name="sdcard_unmount">"Desmontar cartão SD"</string>
+    <string name="sdcard_format">"Formatar cartão SD"</string>
+    <string name="small_font">"Pequeno"</string>
+    <string name="medium_font">"Médio"</string>
+    <string name="large_font">"Grande"</string>
+    <string name="font_size_save">"OK"</string>
+    <string name="sdcard_setting">"Cartão SD"</string>
+    <string name="battery_info_status_label">"Estado da bateria:"</string>
+    <string name="battery_info_scale_label">"Escala da bateria:"</string>
+    <string name="battery_info_level_label">"Nível da bateria:"</string>
+    <string name="battery_info_health_label">"Condição da bateria:"</string>
+    <string name="battery_info_technology_label">"Tecnologia de bateria:"</string>
+    <string name="battery_info_voltage_label">"Tensão da bateria:"</string>
+    <string name="battery_info_voltage_units">"mV"</string>
+    <string name="battery_info_temperature_label">"Temperatura da bateria:"</string>
+    <string name="battery_info_temperature_units">"° C"</string>
+    <string name="battery_info_uptime">"Tempo desde o arranque:"</string>
+    <string name="battery_info_awake_battery">"Tempo de activação na bateria:"</string>
+    <string name="battery_info_awake_plugged">"Tempo de activação durante o carregamento:"</string>
+    <string name="battery_info_screen_on">"Tempo de activação do ecrã:"</string>
+    <string name="battery_info_status_unknown">"Desconhecido"</string>
+    <string name="battery_info_status_charging">"A carregar"</string>
+    <string name="battery_info_status_charging_ac">"(CA)"</string>
+    <string name="battery_info_status_charging_usb">"(USB)"</string>
+    <string name="battery_info_status_discharging">"A descarregar"</string>
+    <string name="battery_info_status_not_charging">"Não está a carregar"</string>
+    <string name="battery_info_status_full">"Completo"</string>
+    <string name="battery_info_health_unknown">"Desconhecido"</string>
+    <string name="battery_info_health_good">"Bom"</string>
+    <string name="battery_info_health_overheat">"Sobreaquecimento"</string>
+    <string name="battery_info_health_dead">"Morto"</string>
+    <string name="battery_info_health_over_voltage">"Sobretensão"</string>
+    <string name="battery_info_health_unspecified_failure">"Erro desconhecido"</string>
+    <string name="bluetooth">"Bluetooth"</string>
+    <string name="bluetooth_visibility">"Detectável"</string>
+    <string name="bluetooth_is_discoverable">"Detectável durante <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos…"</string>
+    <string name="bluetooth_not_discoverable">"Tornar o dispositivo detectável"</string>
+    <string name="bluetooth_devices">"Dispositivos Bluetooth"</string>
+    <string name="bluetooth_device_name">"Nome do dispositivo"</string>
+    <string name="bluetooth_name_not_set">"Nenhum nome definido, utilizar nome da conta"</string>
+    <string name="bluetooth_scan_for_devices">"Procurar dispositivos"</string>
+    <string name="bluetooth_disconnect_blank">"O <xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado."</string>
+    <string name="bluetooth_connected">"Ligado"</string>
+    <string name="bluetooth_disconnected">"Desligado"</string>
+    <string name="bluetooth_disconnecting">"A desligar..."</string>
+    <string name="bluetooth_connecting">"A ligar..."</string>
+    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <skip />
+    <string name="bluetooth_not_connected">"Emparelhar com este dispositivo"</string>
+    <string name="bluetooth_pairing">"A emparelhar..."</string>
+    <string name="bluetooth_paired">"Emparelhado mas não ligado"</string>
+    <string name="bluetooth_device">"mãos-livres/auricular"</string>
+    <string name="progress_scanning">"A procurar"</string>
+    <string name="bluetooth_notif_ticker">"Pedido de emparelhamento de Bluetooth"</string>
+    <string name="bluetooth_notif_title">"Pedido de emparelhamento"</string>
+    <string name="bluetooth_notif_message">"Seleccionar emparelhamento com "</string>
+    <string name="date_and_time">"Definições de data e hora"</string>
+    <string name="date_time_12_hour_sample">"1:00 pm"</string>
+    <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Mudar hora"</string>
+    <string name="date_time_changeDate_text">"Data"</string>
+    <string name="choose_timezone">"Seleccionar fuso horário"</string>
+    <!-- no translation found for normal_date_format (1982904221918374153) -->
+    <skip />
+    <string name="display_preview_label">"Pré-visualização:"</string>
+    <string name="display_font_size_label">"Tamanho do tipo de letra:"</string>
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text">"Enviar <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text">"Iniciar <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label">"Conta:"</string>
+    <string name="proxy_clear_text">"Limpar"</string>
+    <string name="proxy_port_label">"Porta"</string>
+    <string name="proxy_defaultView_text">"Restaurar predefinições"</string>
+    <string name="proxy_action_text">"Guardar"</string>
+    <string name="proxy_hostname_label">"Nome de anfitrião"</string>
+    <string name="proxy_error">"Atenção"</string>
+    <string name="proxy_error_dismiss">"OK"</string>
+    <string name="proxy_error_invalid_host">"O nome de anfitrião que introduziu não é válido."</string>
+    <string name="proxy_error_empty_port">"É necessário preencher o campo referente à porta."</string>
+    <string name="proxy_error_empty_host_set_port">"O campo referente à porta tem de estar vazio se o campo do anfitrião estiver vazio."</string>
+    <string name="proxy_error_invalid_port">"A porta que introduziu não é válida."</string>
+    <string name="radio_info_signal_location_label">"Local:"</string>
+    <string name="radio_info_neighboring_location_label">"CID vizinho"</string>
+    <string name="radio_info_data_attempts_label">"Tentativas de dados:"</string>
+    <string name="radio_info_gprs_service_label">"Serviço GPRS:"</string>
+    <string name="radio_info_roaming_label">"Roaming:"</string>
+    <string name="radio_info_imei_label">"IMEI:"</string>
+    <string name="radio_info_call_redirect_label">"Reencaminhar chamada:"</string>
+    <string name="radio_info_ppp_resets_label">"Número de reposições de PPP desde o arranque:"</string>
+    <string name="radio_info_gsm_disconnects_label">"O GSM desliga:"</string>
+    <string name="radio_info_current_network_label">"Rede actual:"</string>
+    <string name="radio_info_data_successes_label">"Sucessos dos dados:"</string>
+    <string name="radio_info_ppp_received_label">"PPP recebido:"</string>
+    <string name="radio_info_gsm_service_label">"Serviço GSM:"</string>
+    <string name="radio_info_signal_strength_label">"Intensidade de sinal:"</string>
+    <string name="radio_info_call_status_label">"Estado da chamada:"</string>
+    <string name="radio_info_ppp_sent_label">"PPP enviado:"</string>
+    <string name="radio_info_radio_resets_label">"Reposições do rádio:"</string>
+    <string name="radio_info_message_waiting_label">"Mensagem em espera:"</string>
+    <string name="radio_info_phone_number_label">"Número de telefone:"</string>
+    <string name="radio_info_band_mode_label">"Seleccionar banda de rádio"</string>
+    <string name="radio_info_network_type_label">"Tipo de rede:"</string>
+    <string name="radio_info_set_perferred_label">"Definir tipo de rede preferido:"</string>
+    <string name="radio_info_ping_ipaddr">"Ping EnderIp:"</string>
+    <string name="radio_info_ping_hostname">"Efectuar ping de nome de anfitrião (www.google.com):"</string>
+    <string name="radio_info_http_client_test">"Teste de cliente HTTP:"</string>
+    <string name="radio_info_toggle_ciph_label">"Comutar encriptação"</string>
+    <string name="ping_test_label">"Executar teste de ping"</string>
+    <string name="radio_info_smsc_label">"SMSC:"</string>
+    <string name="radio_info_smsc_update_label">"Actualizar"</string>
+    <string name="radio_info_smsc_refresh_label">"Actualizar"</string>
+    <string name="radio_info_toggle_dns_check_label">"Comutar verificação de DNS"</string>
+    <string name="band_mode_title">"Definir banda GSM/UMTS"</string>
+    <string name="band_mode_loading">"A carregar lista de bandas..."</string>
+    <string name="band_mode_set">"Definir"</string>
+    <string name="band_mode_failed">"Sem sucesso"</string>
+    <string name="band_mode_succeeded">"Bem sucedido"</string>
+    <string name="sdcard_changes_instructions">"As alterações terão efeito ao ligar novamente o cabo USB"</string>
+    <string name="sdcard_settings_screen_mass_storage_text">"Activar armazenamento em massa USB"</string>
+    <string name="sdcard_settings_total_bytes_label">"Total de bytes:"</string>
+    <string name="sdcard_settings_not_present_status">"Nenhum cartão SD"</string>
+    <string name="sdcard_settings_available_bytes_label">"Bytes disponíveis:"</string>
+    <string name="sdcard_settings_mass_storage_status">"O cartão SD está a ser utilizado como um dispositivo de armazenamento em massa"</string>
+    <string name="sdcard_settings_unmounted_status">"Agora é seguro retirar o cartão SD"</string>
+    <string name="sdcard_settings_bad_removal_status">"O cartão SD foi removido quando ainda estava em uso!"</string>
+    <string name="sdcard_settings_used_bytes_label">"Bytes utilizados:"</string>
+    <string name="sdcard_settings_scanning_status">"A·procurar·ficheiros·multimédia·no·cartão·SD..."</string>
+    <string name="sdcard_settings_read_only_status">"Cartão SD montado como só de leitura"</string>
+    <string name="next_label">"Seguinte"</string>
+    <string name="language_picker_title">"Região"</string>
+    <string name="select_your_language">"Seleccione o seu idioma"</string>
+    <string name="activity_picker_label">"Seleccionar actividade"</string>
+    <string name="device_info_label">"Informações sobre o dispositivo"</string>
+    <string name="battery_info_label">"Informações da bateria"</string>
+    <string name="battery_history_label">"Histórico da bateria"</string>
+    <string name="display_label">"Visor"</string>
+    <string name="phone_info_label">"Informações do telefone"</string>
+    <string name="sd_card_settings_label">"Cartão SD"</string>
+    <string name="proxy_settings_label">"Definições de proxy"</string>
+    <string name="cancel">"Cancelar"</string>
+    <string name="settings_label">"Definições"</string>
+    <!-- no translation found for settings_shortcut (3672145147925639262) -->
+    <skip />
+    <string name="airplane_mode">"Modo de voo"</string>
+    <string name="airplane_mode_summary">"Desactivar todas as ligações sem fios"</string>
+    <string name="airplane_mode_turning_on">"A desactivar ligações sem fios..."</string>
+    <string name="airplane_mode_turning_off">"A activar ligações sem fios…"</string>
+    <string name="radio_controls_title">"Controlos sem fios"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
+    <string name="date_and_time_settings_title">"Data e hora"</string>
+    <string name="date_and_time_settings_summary">"Definir data, hora, fuso horário e formatos"</string>
+    <string name="date_time_auto">"Automático"</string>
+    <string name="date_time_auto_summaryOn">"Utilizar valores fornecidos pela rede"</string>
+    <string name="date_time_auto_summaryOff">"Utilizar valores fornecidos pela rede"</string>
+    <string name="date_time_24hour">"Utilizar formato de 24 horas"</string>
+    <string name="date_time_set_time">"Definir hora"</string>
+    <string name="date_time_set_timezone">"Seleccionar fuso horário"</string>
+    <string name="date_time_set_date">"Definir data"</string>
+    <string name="date_time_date_format">"Seleccionar formato de data"</string>
+    <string name="zone_list_menu_sort_alphabetically">"Ordenar alfabeticamente"</string>
+    <string name="zone_list_menu_sort_by_timezone">"Ordenar por fuso horário"</string>
+    <string name="security_settings_title">"Segurança e localização"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
+    <string name="security_passwords_title">"Palavras-passe"</string>
+    <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_summary">"Ligar Bluetooth"</string>
+    <string name="bluetooth_settings">"Definições de Bluetooth"</string>
+    <string name="bluetooth_settings_title">"Definições de Bluetooth"</string>
+    <string name="bluetooth_settings_summary">"Gerir ligações, definir nome e detectabilidade do dispositivo"</string>
+    <string name="bluetooth_pin_entry">"Pedido de emparelhamento de Bluetooth"</string>
+    <string name="bluetooth_device_info">"Informações sobre dispositivo Bluetooth"</string>
+    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Introduza o PIN para emparelhar."\n"(Tente 0000 ou 1234.)"</string>
+    <string name="bluetooth_error_title">"Atenção"</string>
+    <string name="bluetooth_pairing_error_message">"Ocorreu um problema ao emparelhar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message">"Ocorreu um problema ao emparelhar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g> porque o PIN introduzido não está correcto."</string>
+    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
+    <skip />
+    <string name="bluetooth_connecting_error_message">"Ocorreu um problema ao ligar a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_preference_scan_title">"Procurar dispositivos"</string>
+    <string name="bluetooth_device_context_connect">"Ligar"</string>
+    <string name="bluetooth_device_context_disconnect">"Desligar"</string>
+    <string name="bluetooth_device_context_pair_connect">"Emparelhar e ligar"</string>
+    <string name="bluetooth_device_context_unpair">"Desemparelhar"</string>
+    <string name="bluetooth_device_context_disconnect_unpair">"Desligar e desemparelhar"</string>
+    <string name="bluetooth_device_context_connect_advanced">"Opções..."</string>
+    <string name="bluetooth_connect_specific_profiles_title">"Ligar a..."</string>
+    <string name="bluetooth_profile_a2dp">"Multimédia"</string>
+    <string name="bluetooth_profile_headset">"Telefone"</string>
+    <string name="bluetooth_summary_connected_to_a2dp">"Ligado ao áudio de multimédia"</string>
+    <string name="bluetooth_summary_connected_to_headset">"Ligado ao áudio do telefone"</string>
+    <string name="bluetooth_summary_connected_to_a2dp_headset">"Ligado ao áudio do telefone e de multimédia"</string>
+    <string name="bluetooth_device_advanced_title">"Opções do <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_device_advanced_online_mode_title">"Ligar"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary">"Ligar a dispositivo Bluetooth"</string>
+    <string name="bluetooth_device_advanced_profile_header_title">"Perfis"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected">"Ligado ao áudio de multimédia"</string>
+    <string name="bluetooth_headset_profile_summary_connected">"Ligado ao áudio do telefone"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for">"Utilizar para áudio de multimédia"</string>
+    <string name="bluetooth_headset_profile_summary_use_for">"Utilizar para áudio do telefone"</string>
+    <string name="wifi">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary">"Activar Wi-Fi"</string>
+    <string name="wifi_settings">"Definições de Wi-Fi"</string>
+    <string name="wifi_settings_category">"Definições de Wi-Fi"</string>
+    <string name="wifi_settings_summary">"Configurar e gerir pontos de acesso sem fios"</string>
+    <string name="forget_network">"Esquecer"</string>
+    <string name="wifi_status">"Estado"</string>
+    <string name="wifi_link_speed">"Velocidade"</string>
+    <string name="wifi_signal_3">"Excelente"</string>
+    <string name="wifi_signal_2">"Bom"</string>
+    <string name="wifi_signal_1">"Suficiente"</string>
+    <string name="wifi_signal_0">"Fraco"</string>
+    <string name="security">"Segurança"</string>
+    <string name="wifi_security_open">"Abrir"</string>
+    <string name="wifi_security_wep">"WEP"</string>
+    <string name="wifi_security_wpa">"WPA"</string>
+    <string name="wifi_security_wpa2">"WPA2"</string>
+    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
+    <skip />
+    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
+    <skip />
+    <string name="wifi_security_unknown">"Desconhecido"</string>
+    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
+    <skip />
+    <string name="ip_address">"Endereço IP"</string>
+    <string name="signal">"Intensidade do sinal"</string>
+    <string name="wifi_starting">"A ligar..."</string>
+    <string name="wifi_stopping">"A desligar..."</string>
+    <string name="wifi_error">"Erro"</string>
+    <string name="error_starting">"Impossível iniciar Wi-Fi"</string>
+    <string name="error_stopping">"Impossível parar Wi-Fi"</string>
+    <string name="error_scanning">"Não·é·possível·procurar·redes"</string>
+    <string name="error_connecting">"Impossível ligar à rede"</string>
+    <string name="error_saving">"Impossível guardar a rede"</string>
+    <string name="connect">"Ligar"</string>
+    <string name="connect_to_blank">"Ligar a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for please_select_eap (4488240331626456338) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for please_type_identity (7061261155499513089) -->
+    <skip />
+    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
+    <skip />
+    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
+    <skip />
+    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
+    <skip />
+    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
+    <skip />
+    <string name="please_type_passphrase">"Palavra-passe de ligação sem fios"</string>
+    <string name="please_type_hex_key">"Chave WEP hexadecimal (0-9, A-F)"</string>
+    <string name="wifi_show_password">"Mostrar palavra-passe."</string>
+    <string name="scan_wifi">"Procurar"</string>
+    <string name="summary_not_in_range">"Fora do alcance"</string>
+    <!-- no translation found for summary_remembered (6079941090549401742) -->
+    <skip />
+    <string name="summary_connection_failed">"A·ligação·falhou.·Seleccione·para·tentar·novamente"</string>
+    <string name="wifi_access_points">"Redes Wi-Fi"</string>
+    <string name="wifi_type_ssid">"SSID da rede"</string>
+    <string name="wifi_security">"Segurança"</string>
+    <string name="wifi_save_config">"Guardar"</string>
+    <string name="wifi_password_unchanged">"(não alterado)"</string>
+    <string name="wifi_add_other_network">"Adicionar rede Wi-Fi"</string>
+    <string name="wifi_notify_open_networks">"Notificação de rede"</string>
+    <string name="wifi_notify_open_networks_summary">"Notificar-me quando estiver disponível uma rede aberta"</string>
+    <string name="wifi_password_incorrect_error">"A palavra-passe de rede que introduziu não está correcta. Tente novamente."</string>
+    <string name="wifi_generic_connection_error">"Ocorreu um problema ao ligar à rede. Tente novamente."</string>
+    <string name="wifi_menu_advanced">"Avançadas"</string>
+    <string name="wifi_ip_settings_titlebar">"Definições de IP"</string>
+    <string name="wifi_ip_settings_menu_save">"Guardar"</string>
+    <string name="wifi_ip_settings_menu_cancel">"Cancelar"</string>
+    <string name="wifi_ip_settings_invalid_ip">"Introduza um endereço IP válido"</string>
+    <string name="wifi_use_static_ip">"Utilizar IP estático"</string>
+    <string name="wifi_ip_address">"Endereço IP"</string>
+    <string name="wifi_dns1">"DNS 1"</string>
+    <string name="wifi_dns2">"DNS 2"</string>
+    <string name="wifi_gateway">"Gateway"</string>
+    <string name="wifi_netmask">"Máscara de rede"</string>
+    <string name="wifi_context_menu_connect">"Ligar a uma rede"</string>
+    <string name="wifi_context_menu_forget">"Esquecer rede"</string>
+    <string name="wifi_context_menu_change_password">"Mudar palavra-passe"</string>
+    <string name="wifi_advanced_titlebar">"Avançadas"</string>
+    <string name="wifi_setting_num_channels_title">"Domínio de regulamentação"</string>
+    <string name="wifi_setting_num_channels_summary">"Definir o número de canais a utilizar"</string>
+    <string name="wifi_setting_num_channels_error">"Ocorreu um problema ao definir o domínio de regulamentação."</string>
+    <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> canais"</string>
+    <string name="wifi_setting_sleep_policy_title">"Política de suspensão Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_summary">"Especificar quando mudar de Wi-Fi para dados móveis"</string>
+    <string name="wifi_setting_sleep_policy_error">"Ocorreu um problema ao definir a política de suspensão."</string>
+    <string name="wifi_advanced_mac_address_title">"Endereço MAC"</string>
+    <string name="fragment_status_scanning">"A procurar..."</string>
+    <string name="fragment_status_connecting">"A ligar a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_authenticating">"A autenticar com <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_obtaining_ip">"A obter endereço IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_connected">"Ligado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="fragment_status_disconnecting">"A desligar de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_disconnected">"Desligado"</string>
+    <string name="fragment_status_failed">"Sem sucesso"</string>
+    <string name="status_scanning">"A procurar..."</string>
+    <string name="status_connecting">"A ligar..."</string>
+    <string name="status_authenticating">"A autenticar..."</string>
+    <string name="status_obtaining_ip">"A obter endereço..."</string>
+    <string name="status_connected">"Ligado"</string>
+    <string name="status_disconnecting">"A desligar..."</string>
+    <string name="status_disconnected">"Desligado"</string>
+    <string name="status_failed">"Sem sucesso"</string>
+    <string name="sound_and_display_settings">"Som e visualização"</string>
+    <string name="sound_settings">"Definições de som"</string>
+    <string name="sound_and_display_settings_summary">"Definir toques, notificações, brilho do ecrã"</string>
+    <string name="silent_mode_title">"Modo silencioso"</string>
+    <string name="silent_mode_summary">"Todos os sons são silenciados, excepto multimédia e alarmes"</string>
+    <string name="silent_mode_incl_alarm_summary">"Todos os sons estão silenciados, excepto multimédia"</string>
+    <string name="ringtone_title">"Toque do telefone"</string>
+    <string name="ringtone_summary">"Definir o toque de chamada recebida predefinido"</string>
+    <string name="ring_volume_title">"Volume da campainha"</string>
+    <string name="ring_volume_summary">"Definir volume para chamadas recebidas e notificações"</string>
+    <string name="vibrate_title">"Vibração do telefone"</string>
+    <string name="vibrate_summary">"Vibrar telefone para chamadas recebidas"</string>
+    <string name="notification_sound_title">"Toque de notificação"</string>
+    <string name="notification_sound_summary">"Definir toque de notificações predefinido"</string>
+    <string name="incoming_call_volume_title">"Volume de chamadas recebidas"</string>
+    <string name="notification_volume_title">"Volume de notificações"</string>
+    <string name="checkbox_notification_same_as_incoming_call">"Utilizar volume de chamadas recebidas para notificações"</string>
+    <string name="notification_sound_dialog_title">"Seleccionar toque de notificações"</string>
+    <string name="media_volume_title">"Volume de multimédia"</string>
+    <string name="media_volume_summary">"Definir volume para música e vídeos"</string>
+    <string name="dtmf_tone_enable_title">"Tons de toque audíveis"</string>
+    <string name="dtmf_tone_enable_summary_on">"Reproduzir tons ao utilizar teclado de marcação"</string>
+    <string name="dtmf_tone_enable_summary_off">"Reproduzir tons ao utilizar teclado de marcação"</string>
+    <string name="sound_effects_enable_title">"Selecção audível"</string>
+    <string name="sound_effects_enable_summary_on">"Reproduzir som ao efectuar selecção no ecrã"</string>
+    <string name="sound_effects_enable_summary_off">"Reproduzir som ao efectuar selecção no ecrã"</string>
+    <string name="play_media_notification_sounds_enable_title">"Notificações do cartão SIM"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
+    <skip />
+    <string name="sync_settings">"Sincronização de dados"</string>
+    <string name="sync_settings_summary">"Seleccionar as aplicações sincronizadas"</string>
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
+    <string name="display_settings">"Definições do visor"</string>
+    <string name="animations_title">"Animação"</string>
+    <string name="animations_summary_on">"Mostrar animação ao abrir e fechar janelas"</string>
+    <string name="animations_summary_off">"Mostrar animação ao abrir e fechar janelas"</string>
+    <string name="accelerometer_title">"Orientação"</string>
+    <string name="accelerometer_summary_on">"Mudar orientação automaticamente ao rodar o telefone"</string>
+    <string name="accelerometer_summary_off">"Mudar orientação automaticamente ao rodar o telefone"</string>
+    <string name="brightness">"Brilho"</string>
+    <string name="brightness_summary">"Ajustar o brilho do ecrã"</string>
+    <string name="screen_timeout">"Tempo limite do ecrã"</string>
+    <string name="screen_timeout_summary">"Ajustar o tempo limite até à desactivação automática do ecrã"</string>
+    <string name="sim_lock_settings">"Definições de bloqueio do cartão SIM"</string>
+    <string name="sim_lock_settings_category">"Configurar bloqueio do cartão SIM"</string>
+    <string name="sim_lock_settings_title">"Bloqueio do cartão SIM"</string>
+    <string name="sim_pin_toggle">"Bloquear cartão SIM"</string>
+    <string name="sim_lock_on">"É necessário o PIN para utilizar o telefone"</string>
+    <string name="sim_lock_off">"É necessário o PIN para utilizar o telefone"</string>
+    <string name="sim_pin_change">"Mudar PIN do SIM"</string>
+    <string name="sim_enter_pin">"PIN do SIM"</string>
+    <string name="sim_enable_sim_lock">"Bloquear cartão SIM"</string>
+    <string name="sim_disable_sim_lock">"Desbloquear cartão SIM"</string>
+    <string name="sim_enter_old">"PIN antigo do SIM"</string>
+    <string name="sim_enter_new">"Novo PIN do SIM"</string>
+    <string name="sim_reenter_new">"Reinserir novo PIN"</string>
+    <string name="sim_change_pin">"PIN do SIM"</string>
+    <string name="sim_bad_pin">"PIN incorrecto!"</string>
+    <string name="sim_pins_dont_match">"Os PINs não correspondem!"</string>
+    <string name="sim_change_failed">"Impossível mudar PIN."\n"PIN possivelmente incorrecto."</string>
+    <string name="sim_change_succeeded">"PIN do SIM mudado com sucesso"</string>
+    <string name="sim_lock_failed">"Impossível mudar estado de bloqueio do cartão SIM."\n"PIN possivelmente incorrecto."</string>
+    <string name="sim_enter_ok">"OK"</string>
+    <string name="sim_enter_cancel">"Cancelar"</string>
+    <string name="device_info_settings">"Estado do telefone"</string>
+    <string name="system_update_settings_list_item_title">"Actualizações do sistema"</string>
+    <string name="system_update_settings_list_item_summary">"Verificar actualizações do sistema"</string>
+    <string name="firmware_version">"Versão de firmware"</string>
+    <string name="model_number">"Número de modelo"</string>
+    <string name="baseband_version">"Versão de banda base"</string>
+    <string name="kernel_version">"Versão do kernel"</string>
+    <string name="build_number">"Número de compilação"</string>
+    <string name="device_info_not_available">"Não disponível"</string>
+    <string name="device_status_activity_title">"Estado"</string>
+    <string name="device_status">"Estado"</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
+    <string name="storage_settings_title">"Armazenamento do telefone e cartão SD"</string>
+    <string name="storage_settings_summary">"Desmontar cartão SD, ver armazenamento disponível"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
+    <string name="status_network_type">"Tipo de rede móvel"</string>
+    <string name="status_data_state">"Estado da rede móvel"</string>
+    <string name="status_service_state">"Estado do serviço"</string>
+    <string name="status_signal_strength">"Intensidade do sinal"</string>
+    <string name="status_roaming">"Roaming"</string>
+    <string name="status_operator">"Rede"</string>
+    <string name="status_wifi_mac_address">"Endereço MAC de Wi-Fi:"</string>
+    <string name="status_bt_address">"Endereço Bluetooth"</string>
+    <string name="status_unavailable">"Indisponível"</string>
+    <string name="status_up_time">"Tempo de actividade"</string>
+    <string name="status_awake_time">"Hora de actividade"</string>
+    <string name="internal_memory">"Armazenamento interno do telefone"</string>
+    <string name="sd_memory">"Cartão SD"</string>
+    <string name="memory_available">"Espaço disponível"</string>
+    <string name="memory_size">"Espaço total"</string>
+    <string name="sd_eject">"Desmontar cartão SD"</string>
+    <string name="sd_eject_summary">"Desmontar o cartão SD para remoção segura"</string>
+    <string name="sd_format">"Formatar cartão SD"</string>
+    <string name="sd_format_summary">"Formatar (apagar) o cartão SD"</string>
+    <string name="sd_unavailable">"Indisponível"</string>
+    <string name="read_only">" (Só de leitura)"</string>
+    <string name="battery_status_title">"Estado da bateria"</string>
+    <string name="battery_level_title">"Nível da bateria"</string>
+    <string name="apn_settings">"APNs"</string>
+    <string name="apn_edit">"Editar ponto de acesso"</string>
+    <string name="apn_not_set">"&lt;Não definido&gt;"</string>
+    <string name="apn_name">"Nome"</string>
+    <string name="apn_apn">"APN"</string>
+    <string name="apn_http_proxy">"Proxy"</string>
+    <string name="apn_http_port">"Porta"</string>
+    <string name="apn_user">"Nome de utilizador"</string>
+    <string name="apn_password">"Palavra-passe"</string>
+    <string name="apn_server">"Servidor"</string>
+    <string name="apn_mmsc">"MMSC"</string>
+    <string name="apn_mms_proxy">"Proxy de MMS"</string>
+    <string name="apn_mms_port">"Porta MMS"</string>
+    <string name="apn_mcc">"MCC"</string>
+    <string name="apn_mnc">"MNC"</string>
+    <string name="apn_type">"Tipo APN"</string>
+    <string name="menu_delete">"Eliminar APN"</string>
+    <string name="menu_new">"Novo APN"</string>
+    <string name="menu_save">"Guardar"</string>
+    <string name="menu_cancel">"Rejeitar"</string>
+    <string name="error_title">"Atenção"</string>
+    <string name="error_name_empty">"O campo Nome não pode estar vazio."</string>
+    <string name="error_apn_empty">"A APN não pode estar vazia."</string>
+    <string name="error_mcc_not3">"O campo MCC tem de ter 3 dígitos."</string>
+    <string name="error_mnc_not23">"O campo MNC tem de ter 2 ou 3 dígitos."</string>
+    <string name="restore_default_apn">"A restaurar predefinições de APN"</string>
+    <string name="menu_restore">"Repor predefinição"</string>
+    <string name="restore_default_apn_completed">"Reposição de predefinições de APN concluída"</string>
+    <string name="master_clear_title">"Reposição dos dados de fábrica"</string>
+    <string name="master_clear_summary">"Apaga todos os dados do telefone"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
+    <string name="master_clear_button_text">"Repor telefone"</string>
+    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
+    <skip />
+    <string name="master_clear_final_button_text">"Apagar tudo"</string>
+    <string name="master_clear_gesture_prompt">"Desenhe o seu padrão de desbloqueio"</string>
+    <string name="master_clear_gesture_explanation">"Tem de desenhar o seu padrão de desbloqueio para confirmar uma reposição do telefone."</string>
+    <string name="master_clear_failed">"Não  foi efectuada nenhuma reposição porque o serviço System Clear não está disponível."</string>
+    <string name="media_format_title">"Formatar cartão SD."</string>
+    <string name="media_format_summary">"Apaga todos os dados do cartão SD"</string>
+    <string name="media_format_desc">"Esta acção irá apagar o cartão SD no telefone. Perder-se-ão TODOS os dados do cartão!"</string>
+    <string name="media_format_button_text">"Formatar cartão SD"</string>
+    <string name="media_format_final_desc">"Formatar cartão SD, apagando todos os seus dados multimédia? Não é possível reverter a acção!"</string>
+    <string name="media_format_final_button_text">"Apagar tudo"</string>
+    <string name="media_format_gesture_prompt">"Desenhe o seu padrão de desbloqueio"</string>
+    <string name="media_format_gesture_explanation">"Tem de efectuar o padrão de desbloqueio para confirmar a formatação de um cartão SD."</string>
+    <string name="call_settings_title">"Definições de chamadas"</string>
+    <string name="call_settings_summary">"Configurar correio de voz, reencaminhamento de chamadas, chamada em espera, ID do autor da chamada"</string>
+    <string name="network_settings_title">"Redes móveis"</string>
+    <string name="network_settings_summary">"Definir opções de roaming, redes, APNs"</string>
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
+    <string name="location_network_based">"Utilizar redes sem fios"</string>
+    <string name="location_networks_disabled">"Ver localização em aplicações (tais como Mapas) utilizando redes sem fios"</string>
+    <string name="location_neighborhood_level">"Localização determinada por redes Wi-Fi e/ou móvel"</string>
+    <string name="location_gps">"Activar satélites de GPS"</string>
+    <string name="location_street_level">"Ao localizar, determinar a localização exacta ao nível da rua (anular selecção para preservar a bateria)"</string>
+    <string name="location_gps_disabled">"Localizar ao nível da rua (requer mais bateria e vista do céu)"</string>
+    <!-- no translation found for use_location_title (7585990952633568732) -->
+    <skip />
+    <!-- no translation found for use_location_summary (4411467143899877395) -->
+    <skip />
+    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
+    <skip />
+    <string name="agree">"Concordo"</string>
+    <string name="disagree">"Discordar"</string>
+    <string name="about_settings">"Acerca do telefone"</string>
+    <string name="about_settings_summary">"Ver informações jurídicas, estado do telefone, versão de software"</string>
+    <string name="legal_information">"Informações legais"</string>
+    <string name="contributors_title">"Contribuintes"</string>
+    <string name="copyright_title">"Direitos de autor"</string>
+    <string name="license_title">"Licença"</string>
+    <string name="terms_title">"Termos e condições"</string>
+    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
+    <skip />
+    <string name="system_tutorial_list_item_summary">"Saiba como utilizar o seu telefone"</string>
+    <string name="settings_license_activity_title">"Licenças open source"</string>
+    <string name="settings_license_activity_unavailable">"Ocorreu um problema ao carregar as licenças."</string>
+    <string name="settings_license_activity_loading">"A carregar..."</string>
+    <string name="lock_settings_title">"Padrão de desbloqueio do ecrã"</string>
+    <string name="lockpattern_change_lock_pattern_label">"Mudar padrão de desbloqueio"</string>
+    <string name="lockpattern_need_to_unlock">"Confirmar padrão guardado"</string>
+    <string name="lockpattern_need_to_unlock_wrong">"Lamentamos, tente novamente:"</string>
+    <string name="lockpattern_recording_intro_header">"Desenhar um padrão de desbloqueio"</string>
+    <string name="lockpattern_recording_intro_footer">"Prima Menu para obter ajuda."</string>
+    <string name="lockpattern_recording_inprogress">"Retirar dedo quando concluído."</string>
+    <string name="lockpattern_recording_incorrect_too_short">"Ligue pelo menos <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente:"</string>
+    <string name="lockpattern_pattern_entered_header">"Padrão gravado!"</string>
+    <string name="lockpattern_need_to_confirm">"Desenhe novamente o padrão para confirmar:"</string>
+    <string name="lockpattern_pattern_confirmed_header">"O seu novo padrão de desbloqueio:"</string>
+    <string name="lockpattern_confirm_button_text">"Confirmar"</string>
+    <string name="lockpattern_restart_button_text">"Redesenhar"</string>
+    <string name="lockpattern_retry_button_text">"Tentar novamente"</string>
+    <string name="lockpattern_continue_button_text">"Continuar"</string>
+    <string name="lockpattern_settings_title">"Padrão de desbloqueio"</string>
+    <string name="lockpattern_settings_enable_title">"Solicitar padrão"</string>
+    <string name="lockpattern_settings_enable_summary">"É necessário desenhar padrão para desbloquear ecrã"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">"Utilizar padrão visível"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"Utilizar feedback táctil"</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"Definir padrão de desbloqueio"</string>
+    <string name="lockpattern_settings_change_lock_pattern">"Mudar padrão de desbloqueio"</string>
+    <string name="lockpattern_settings_help_how_to_record">"Como desenhar um padrão de desbloqueio"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Demasiadas tentativas incorrectas!"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Tente novamente dentro de <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
+    <string name="skip_button_label">"Cancelar"</string>
+    <string name="next_button_label">"Seguinte"</string>
+    <string name="lock_title">"Manter segurança do telefone"</string>
+    <string name="lock_intro_message"><font size="17">"Proteja o seu telefone de utilização não autorizada criando um padrão pessoal de desbloqueio do ecrã. "\n<font height="17">\n</font><b>"1"</b>"  No ecrã seguinte, observe enquanto é desenhado um padrão exemplificativo. "\n<font height="17">\n</font><b>"2"</b>"  Quando estiver pronto, desenhe o seu padrão pessoal de desbloqueio. Experimente diferentes padrões, mas ligue pelo menos quatro pontos. "\n<font height="17">\n</font><b>"3"</b>"  Redesenhe o seu padrão para confirmar. "\n<font height="17">\n</font><b>"Pronto para começar? Seleccione “Seguinte”"</b>". "\n<font height="3">\n</font>"Para deixar o seu telefone sem protecção, seleccione “Cancelar”."</font></string>
+    <string name="lock_example_title">"Padrão exemplificativo"</string>
+    <string name="lock_example_message">"Ligue pelo menos quatro pontos."\n" "\n"Seleccione “Seguinte” quando estiver pronto para desenhar o seu próprio padrão."</string>
+    <string name="manageapplications_settings_title">"Gerir aplicações"</string>
+    <string name="manageapplications_settings_summary">"Gerir e remover aplicações instaladas"</string>
+    <string name="applications_settings">"Aplicações"</string>
+    <string name="applications_settings_summary">"Gerir aplicações, configurar atalhos de iniciação rápida"</string>
+    <string name="applications_settings_header">"Definições da aplicação"</string>
+    <string name="install_applications">"Fontes desconhecidas"</string>
+    <string name="install_unknown_applications">"Permitir instalação de aplicações não Market"</string>
+    <string name="install_all_warning">"O seu telefone e os seus dados pessoais estão mais vulneráveis a ataques por aplicações de fontes desconhecidas. O utilizador reconhece ser o único responsável por quais danos ao telefone ou por perda de dados que possam resultar da utilização destas aplicações."</string>
+    <string name="application_info_label">"Informações da aplicação"</string>
+    <string name="storage_label">"Armazenamento"</string>
+    <string name="auto_launch_label">"Iniciar por predefinição"</string>
+    <string name="permissions_label">"Permissões"</string>
+    <string name="cache_header_label">"Cache"</string>
+    <string name="clear_cache_btn_text">"Limpar cache"</string>
+    <string name="cache_size_label">"Cache"</string>
+    <string name="controls_label">"Controlos"</string>
+    <string name="force_stop">"Forçar paragem"</string>
+    <string name="total_size_label">"Total"</string>
+    <string name="application_size_label">"Aplicação"</string>
+    <string name="data_size_label">"Dados"</string>
+    <string name="uninstall_text">"Desinstalar"</string>
+    <string name="clear_user_data_text">"Limpar dados"</string>
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
+    <string name="auto_launch_enable_text">"Optou por iniciar esta aplicação por predefinição para algumas acções."</string>
+    <string name="auto_launch_disable_text">"Nenhuma predefinição definida."</string>
+    <string name="clear_activities">"Limpar predefinições"</string>
+    <string name="unknown">"Desconhecido"</string>
+    <string name="sort_order_alpha">"Ordenar"</string>
+    <string name="sort_order_size">"Ordenar por tamanho"</string>
+    <string name="manage_space_text">"Gerir espaço"</string>
+    <string name="filter">"Filtrar"</string>
+    <string name="filter_dlg_title">"Seleccionar opções de filtro"</string>
+    <string name="filter_apps_all">"Todas"</string>
+    <string name="filter_apps_third_party">"De terceiros"</string>
+    <string name="filter_apps_running">"Em execução"</string>
+    <string name="loading">"A carregar..."</string>
+    <string name="recompute_size">"A recalcular tamanho..."</string>
+    <string name="clear_data_dlg_title">"Eliminar"</string>
+    <string name="clear_data_dlg_text">"Todas as informações que guardou nesta aplicação serão eliminadas de forma permanente."</string>
+    <string name="dlg_ok">"OK"</string>
+    <string name="dlg_cancel">"Cancelar"</string>
+    <string name="app_not_found_dlg_title">"Aplicação não encontrada"</string>
+    <string name="app_not_found_dlg_text">"Não foi possível localizar a aplicação na lista de aplicações instaladas."</string>
+    <string name="clear_data_failed">"Impossível limpar dados da aplicação."</string>
+    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
+    <skip />
+    <string name="security_settings_desc">"Esta aplicação pode aceder aos seguintes itens no seu telefone:"</string>
+    <string name="computing_size">"A calcular..."</string>
+    <string name="invalid_size_value">"Impossível calcular tamanho do pacote"</string>
+    <string name="empty_list_msg">"Não tem nenhuma aplicação de terceiros instalada."</string>
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
+    <string name="language_settings">"Região e texto"</string>
+    <string name="language_settings_summary">"Definir opções de região (idioma e região), entrada de texto e correcção automática"</string>
+    <string name="language_category">"Definição de região"</string>
+    <string name="text_category">"Definições de texto"</string>
+    <string name="phone_language">"Seleccionar região"</string>
+    <string name="phone_language_summary">"Seleccionar idioma e região"</string>
+    <string name="auto_replace">"Substituir automaticamente"</string>
+    <string name="auto_replace_summary">"Corrigir erros ortográficos"</string>
+    <string name="auto_caps">"Maiúsculas automáticas"</string>
+    <string name="auto_caps_summary">"Colocar em maiúscula a primeira letra de frases"</string>
+    <string name="auto_punctuate">"Pontuação automática"</string>
+    <string name="hardkeyboard_category">"Definições do teclado físico"</string>
+    <string name="auto_punctuate_summary">"Prima duas vezes a tecla Espaço para inserir \".\""</string>
+    <string name="show_password">"Palavras-passe visíveis"</string>
+    <string name="show_password_summary">"Mostrar palavra-passe ao escrever"</string>
+    <string name="ime_security_warning">"Este método de entrada pode permitir recolher todo o texto que introduzir, incluindo dados pessoais como, por exemplo, palavras-passe e números de cartão de crédito. Decorre da aplicação <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Activar este método de entrada?"</string>
+    <string name="user_dict_settings_titlebar">"Dicionário do utilizador"</string>
+    <string name="user_dict_settings_title">"Dicionário do utilizador"</string>
+    <string name="user_dict_settings_summary">"Adicionar e remover palavras do dicionário do utilizador"</string>
+    <string name="user_dict_settings_add_menu_title">"Adicionar"</string>
+    <string name="user_dict_settings_add_dialog_title">"Adicionar ao dicionário"</string>
+    <string name="user_dict_settings_edit_dialog_title">"Editar palavra"</string>
+    <string name="user_dict_settings_context_menu_edit_title">"Editar"</string>
+    <string name="user_dict_settings_context_menu_delete_title">"Eliminar"</string>
+    <string name="user_dict_settings_empty_text">"Não tem qualquer palavra no dicionário do utilizador. Pode adicionar uma palavra através do menu."</string>
+    <string name="testing">"Testes"</string>
+    <string name="testing_phone_info">"Informações do telefone"</string>
+    <string name="testing_battery_info">"Informação da bateria"</string>
+    <string name="testing_battery_history">"Histórico da bateria"</string>
+    <string name="quick_launch_title">"Iniciação rápida"</string>
+    <string name="quick_launch_summary">"Definir atalhos do teclado para iniciar aplicações"</string>
+    <string name="quick_launch_assign_application">"Atribuir aplicação"</string>
+    <string name="quick_launch_no_shortcut">"Nenhum atalho"</string>
+    <string name="quick_launch_shortcut">"Pesquisar + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
+    <string name="quick_launch_clear_dialog_title">"Limpar"</string>
+    <string name="quick_launch_clear_dialog_message">"O seu atalho para <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) será limpo."</string>
+    <string name="quick_launch_clear_ok_button">"OK"</string>
+    <string name="quick_launch_clear_cancel_button">"Cancelar"</string>
+    <string name="quick_launch_display_mode_applications">"Aplicações"</string>
+    <string name="quick_launch_display_mode_shortcuts">"Atalhos"</string>
+    <string name="input_methods_settings_title">"Entrada de texto"</string>
+    <string name="input_methods_settings_summary">"Gerir opções de entrada de texto"</string>
+    <string name="input_methods_settings_label_format">"Definições de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="onscreen_keyboard_settings_summary">"Definições do teclado no ecrã"</string>
+    <string name="builtin_keyboard_settings_title">"Teclado do dispositivo"</string>
+    <string name="builtin_keyboard_settings_summary">"Definições do teclado incorporado"</string>
+    <string name="development_settings_title">"Desenvolvimento"</string>
+    <string name="development_settings_summary">"Definir opções de desenvolvimento da aplicação"</string>
+    <string name="enable_adb">"Depuração USB"</string>
+    <string name="enable_adb_summary">"Modo de depuração com USB ligado"</string>
+    <string name="keep_screen_on">"Manter activo"</string>
+    <string name="keep_screen_on_summary">"O ecrã nunca entrará em suspensão durante o carregamento"</string>
+    <string name="allow_mock_location">"Permitir locais fictícios"</string>
+    <string name="allow_mock_location_summary">"Permitir locais fictícios"</string>
+    <!-- no translation found for adb_warning_title (1756027479229533250) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (5352555112049663033) -->
+    <skip />
+    <string name="gadget_picker_title">"Escolher miniaplicação"</string>
+    <string name="widget_picker_title">"Escolher widget"</string>
+    <string name="battery_history_details_for">"Detalhes de UID %d"</string>
+    <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
+    <string name="battery_history_network_usage">"Detalhes de utilização de rede para <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
+    <string name="battery_history_bytes_received">"Bytes recebidos: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_sent">"Bytes enviados: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_total">"Total de bytes: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_cpu_usage">"Detalhes de utilização da CPU para <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
+    <string name="battery_history_user_time">"Tempo do utilizador:"</string>
+    <string name="battery_history_system_time">"Hora do sistema:"</string>
+    <string name="battery_history_total_time">"Tempo total:"</string>
+    <string name="battery_history_starts">"Inícios: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
+    <string name="battery_history_packages_sharing_this_uid">"Pacotes que partilham este UID:"</string>
+    <string name="battery_history_no_data">"Não existem dados de utilização da bateria disponíveis"</string>
+    <string name="battery_history_sensor">"Sensor:"</string>
+    <string name="battery_history_wakelock">"Activação permanente parcial:"</string>
+    <string name="battery_history_used_by_packages">"Sensor utilizado por pacotes:"</string>
+    <string name="battery_history_sensor_usage">"Utilizado <xliff:g id="COUNT">%1$d</xliff:g> vezes por <xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
+    <string name="battery_history_sensor_usage_multi">"Utilizado <xliff:g id="COUNT">%1$d</xliff:g> vezes por um dos seguintes:"</string>
+    <string name="battery_history_awake_label">"Em execução"</string>
+    <string name="battery_history_screen_on_label">"Ecrã activo"</string>
+    <string name="battery_history_phone_on_label">"Telefone ligado"</string>
+    <string name="battery_history_awake">"Tempo decorrido sem suspensão:"</string>
+    <string name="battery_history_screen_on">"Tempo decorrido com o ecrã ligado:"</string>
+    <string name="battery_history_phone_on">"Tempo decorrido com o telefone ligado:"</string>
+    <string name="battery_history_screen_on_battery">"Bateria activa:"</string>
+    <string name="battery_history_screen_on_plugged">"Ligado:"</string>
+    <string name="usage_stats_label">"Estatísticas de utilização"</string>
+    <string name="testing_usage_stats">"Estatísticas de utilização"</string>
+    <string name="display_order_text">"Ordenar por:"</string>
+    <string name="app_name_label">"Aplicação"</string>
+    <string name="launch_count_label">"Total"</string>
+    <string name="usage_time_label">"Tempo de utilização"</string>
+    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
+    <skip />
+    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
+    <skip />
+    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
+    <skip />
+    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (4630925382578609056) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
+    <skip />
+    <!-- no translation found for usage_name_percent (1899151069711662289) -->
+    <skip />
+    <!-- no translation found for details_title (7564809986329021063) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (2353149143338929583) -->
+    <skip />
+    <!-- no translation found for power_wifi (2382791137776486974) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (7052979399415080971) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
+    <skip />
+    <!-- no translation found for battery_action_display (5302763261448580102) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3003604969548979254) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (1834412555123982714) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for tts_settings (6454363854545277027) -->
+    <skip />
+    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (5064947197040356736) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_demo (405357591189935876) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for gadget_title (7455548605888590466) -->
+    <skip />
+    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
+    <skip />
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
+    <skip />
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
+    <skip />
+    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
+    <skip />
+    <!-- no translation found for vpn_no_button (7620339571187119107) -->
+    <skip />
+    <!-- no translation found for vpn_back_button (192036339792734970) -->
+    <skip />
+    <!-- no translation found for vpn_mistake_button (1759404628590603933) -->
+    <skip />
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <!-- no translation found for vpn_connecting (8039521381692090116) -->
+    <skip />
+    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
+    <skip />
+    <!-- no translation found for vpn_connected (7641723116362845781) -->
+    <skip />
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
+</resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 59c9049..f2516e7 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -22,7 +22,7 @@
     <item>"Ásia"</item>
     <item>"Austrália"</item>
     <item>"Pacífico"</item>
-    <item>"Tudo"</item>
+    <item>"Todos"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
     <item>"15 segundos"</item>
@@ -30,7 +30,7 @@
     <item>"1 minuto"</item>
     <item>"2 minutos"</item>
     <item>"10 minutos"</item>
-    <item>"Nunca esgotar o tempo"</item>
+    <item>"Nunca esgotar o tempo limite"</item>
   </string-array>
     <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
     <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
@@ -42,6 +42,12 @@
     <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
     <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
     <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
+    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
+    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
+    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
+    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
+    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
+    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
     <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
     <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
     <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
@@ -55,21 +61,29 @@
     <item>"WEP ASCII"</item>
     <item>"WEP hexadecimal"</item>
   </string-array>
-    <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
-    <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
-    <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
-    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
-    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
-    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
-    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
-    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
-    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
-    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
-    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
-    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
-    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
-    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
-    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
+  <string-array name="wifi_sleep_policy_entries">
+    <item>"Quando a tela é desativada"</item>
+    <item>"Nunca quando conectado"</item>
+    <item>"Nunca"</item>
+  </string-array>
+  <string-array name="battery_history_type_spinner">
+    <item>"Uso da CPU"</item>
+    <item>"Uso da rede"</item>
+    <item>"Uso do GPS"</item>
+    <item>"Uso do sensor"</item>
+    <item>"Uso de ativação parcial"</item>
+    <item>"Outro uso"</item>
+  </string-array>
+  <string-array name="battery_history_which_spinner">
+    <item>"Desde que foi desconectado pela última vez"</item>
+    <item>"Total desde a inicialização"</item>
+    <item>"Total geral"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item>"Tempo de uso"</item>
+    <item>"Iniciar contagem"</item>
+    <item>"Nome do aplicativo"</item>
+  </string-array>
     <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
     <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
     <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
@@ -78,4 +92,7 @@
     <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
     <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
     <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 724dcf1..e741141 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -16,24 +16,24 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Desconhecido"</string>
-    <string name="turn_on_radio">"Ligar rádio"</string>
-    <string name="turn_off_radio">"Desligar rádio"</string>
-    <string name="turn_on_qxdm">"Ativar registro do QXDM SD"</string>
-    <string name="turn_off_qxdm">"Desativar registro do QXDM SD"</string>
-    <string name="radioInfo_menu_viewADN">"Exibir catálogo de endereços do SIM"</string>
-    <string name="radioInfo_menu_viewFDN">"Exibir números de discagem fixa"</string>
-    <string name="radioInfo_menu_viewSDN">"Exibir números de discagem de serviço"</string>
-    <string name="radioInfo_menu_getPDP">"Obter lista PDP"</string>
+    <string name="turn_on_radio">"Ativar o rádio"</string>
+    <string name="turn_off_radio">"Desativar o rádio"</string>
+    <string name="turn_on_qxdm">"Ativar registro do SD QXDM"</string>
+    <string name="turn_off_qxdm">"Desativar registro do SD QXDM"</string>
+    <string name="radioInfo_menu_viewADN">"Visualizar o catálogo de endereços do SIM"</string>
+    <string name="radioInfo_menu_viewFDN">"Visualizar números de chamada fixa"</string>
+    <string name="radioInfo_menu_viewSDN">"Visualizar números de chamada de serviço"</string>
+    <string name="radioInfo_menu_getPDP">"Obter a lista PDP"</string>
     <string name="radioInfo_menu_enableData">"Ativar conexão de dados"</string>
     <string name="radioInfo_menu_disableData">"Desativar conexão de dados"</string>
     <string name="radioInfo_menu_enableDataOnBoot">"Ativar dados na inicialização"</string>
     <string name="radioInfo_menu_disableDataOnBoot">"Desativar dados na inicialização"</string>
-    <string name="radioInfo_service_in">"Em uso"</string>
+    <string name="radioInfo_service_in">"Em serviço"</string>
     <string name="radioInfo_service_out">"Fora de serviço"</string>
     <string name="radioInfo_service_emergency">"Apenas chamadas de emergência"</string>
-    <string name="radioInfo_service_off">"Rádio desligado"</string>
+    <string name="radioInfo_service_off">"Rádio desativado"</string>
     <string name="radioInfo_roaming_in">"Roaming"</string>
-    <string name="radioInfo_roaming_not">"Não há roaming"</string>
+    <string name="radioInfo_roaming_not">"Não está em roaming"</string>
     <string name="radioInfo_phone_idle">"Ocioso"</string>
     <string name="radioInfo_phone_ringing">"Tocando"</string>
     <string name="radioInfo_phone_offhook">"Chamada em andamento"</string>
@@ -49,159 +49,158 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"Desmontar cartão SD"</string>
-    <!-- no translation found for sdcard_format (362497552060004057) -->
-    <skip />
+    <string name="sdcard_format">"Formatar cartão SD"</string>
     <string name="small_font">"Pequeno"</string>
-    <string name="medium_font">"Meio"</string>
+    <string name="medium_font">"Médio"</string>
     <string name="large_font">"Grande"</string>
     <string name="font_size_save">"OK"</string>
     <string name="sdcard_setting">"Cartão SD"</string>
     <string name="battery_info_status_label">"Status da bateria:"</string>
     <string name="battery_info_scale_label">"Escala da bateria:"</string>
     <string name="battery_info_level_label">"Nível da bateria:"</string>
-    <string name="battery_info_health_label">"Saúde da bateria:"</string>
+    <string name="battery_info_health_label">"Integridade da bateria:"</string>
     <string name="battery_info_technology_label">"Tecnologia da bateria:"</string>
-    <string name="battery_info_voltage_label">"Tensão da bateria:"</string>
+    <string name="battery_info_voltage_label">"Voltagem da bateria:"</string>
     <string name="battery_info_voltage_units">"mV"</string>
     <string name="battery_info_temperature_label">"Temperatura da bateria:"</string>
     <string name="battery_info_temperature_units">"° C"</string>
     <string name="battery_info_uptime">"Tempo desde a inicialização:"</string>
-    <string name="battery_info_awake_battery">"Tempo de atividade usando a bateria:"</string>
-    <string name="battery_info_awake_plugged">"Tempo de atividade durante a carga:"</string>
-    <string name="battery_info_screen_on">"Tela Tempo LIGADA:"</string>
+    <string name="battery_info_awake_battery">"Tempo de ativação da bateria:"</string>
+    <string name="battery_info_awake_plugged">"Tempo de ativação durante o carregamento:"</string>
+    <string name="battery_info_screen_on">"Tempo de ativação da tela:"</string>
     <string name="battery_info_status_unknown">"Desconhecido"</string>
     <string name="battery_info_status_charging">"Carregando"</string>
     <string name="battery_info_status_charging_ac">"(CA)"</string>
     <string name="battery_info_status_charging_usb">"(USB)"</string>
     <string name="battery_info_status_discharging">"Descarregando"</string>
     <string name="battery_info_status_not_charging">"Não está carregando"</string>
-    <string name="battery_info_status_full">"Cheia"</string>
+    <string name="battery_info_status_full">"Cheio"</string>
     <string name="battery_info_health_unknown">"Desconhecido"</string>
     <string name="battery_info_health_good">"Bom"</string>
     <string name="battery_info_health_overheat">"Superaquecimento"</string>
-    <string name="battery_info_health_dead">"Inativo"</string>
-    <string name="battery_info_health_over_voltage">"Sobre tensão"</string>
+    <string name="battery_info_health_dead">"Descarregada"</string>
+    <string name="battery_info_health_over_voltage">"Sobretensão"</string>
     <string name="battery_info_health_unspecified_failure">"Erro desconhecido"</string>
     <string name="bluetooth">"Bluetooth"</string>
     <string name="bluetooth_visibility">"Detectável"</string>
     <string name="bluetooth_is_discoverable">"Detectável por <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos…"</string>
-    <string name="bluetooth_not_discoverable">"Fazer com que o dispositivo possa ser localizado"</string>
-    <string name="bluetooth_devices">"Dispositivos bluetooth"</string>
+    <string name="bluetooth_not_discoverable">"Tornar dispositivo detectável"</string>
+    <string name="bluetooth_devices">"Dispositivos Bluetooth"</string>
     <string name="bluetooth_device_name">"Nome do dispositivo"</string>
-    <string name="bluetooth_name_not_set">"Nenhum nome definido, usando nome da conta"</string>
-    <string name="bluetooth_scan_for_devices">"Examinar em busca de dispositivos"</string>
-    <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado."</string>
+    <string name="bluetooth_name_not_set">"Não há nenhum nome definido. Usando o nome da conta."</string>
+    <string name="bluetooth_scan_for_devices">"Verificar a existência de dispositivos"</string>
+    <string name="bluetooth_disconnect_blank">"O <xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado."</string>
     <string name="bluetooth_connected">"Conectado"</string>
     <string name="bluetooth_disconnected">"Desconectado"</string>
     <string name="bluetooth_disconnecting">"Desconectando…"</string>
-    <string name="bluetooth_connecting">"Conectando…"</string>
+    <string name="bluetooth_connecting">"Conectando..."</string>
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"Parear com este dispositivo"</string>
     <string name="bluetooth_pairing">"Pareando…"</string>
-    <!-- no translation found for bluetooth_paired (1247541089000057726) -->
-    <skip />
-    <string name="bluetooth_device">"viva-voz/headset"</string>
-    <string name="progress_scanning">"Examinando"</string>
-    <string name="bluetooth_notif_ticker">"Solicitação de pareamento de Bluetooth"</string>
+    <string name="bluetooth_paired">"Pareado, mas não conectado"</string>
+    <string name="bluetooth_device">"viva-voz/fone de ouvido"</string>
+    <string name="progress_scanning">"Verificando"</string>
+    <string name="bluetooth_notif_ticker">"Solicitação de pareamento Bluetooth"</string>
     <string name="bluetooth_notif_title">"Solicitação de pareamento"</string>
-    <string name="bluetooth_notif_message">"Selecionar para fazer pareamento "</string>
-    <string name="date_and_time">"Configurações de data &amp; hora"</string>
-    <string name="date_time_12_hour_sample">"13:00"</string>
+    <string name="bluetooth_notif_message">"Selecione para parear "</string>
+    <string name="date_and_time">"Configurações de data e hora"</string>
+    <string name="date_time_12_hour_sample">"1:00 pm"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
-    <!-- no translation found for date_time_changeTime_text (7037437020000867740) -->
+    <string name="date_time_changeTime_text">"Alterar horário"</string>
+    <string name="date_time_changeDate_text">"Data"</string>
+    <string name="choose_timezone">"Selecionar fuso horário"</string>
+    <!-- no translation found for normal_date_format (1982904221918374153) -->
     <skip />
-    <!-- no translation found for date_time_changeDate_text (5259762626498028057) -->
-    <skip />
-    <string name="choose_timezone">"Selecione fuso horário"</string>
-    <string name="display_preview_label">"Visualização:"</string>
+    <string name="display_preview_label">"Visualizar:"</string>
     <string name="display_font_size_label">"Tamanho da fonte:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
     <skip />
-    <string name="intent_sender_sendbroadcast_text">"Enviar <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_sendbroadcast_text">"Enviar<xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
-    <string name="intent_sender_startactivity_text">"Iniciar<xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_startactivity_text">"Iniciar <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label">"Conta:"</string>
     <string name="proxy_clear_text">"Limpar"</string>
     <string name="proxy_port_label">"Porta"</string>
-    <string name="proxy_defaultView_text">"Restaurar padrão"</string>
+    <string name="proxy_defaultView_text">"Restaurar padrões"</string>
     <string name="proxy_action_text">"Salvar"</string>
     <string name="proxy_hostname_label">"Nome do host"</string>
     <string name="proxy_error">"Atenção"</string>
     <string name="proxy_error_dismiss">"OK"</string>
-    <string name="proxy_error_invalid_host">"O nome do host digitado não é válido."</string>
-    <string name="proxy_error_empty_port">"Você deve preencher o campo da porta."</string>
-    <string name="proxy_error_empty_host_set_port">"O campo da porta deverá ficar vazio se o campo do host estiver vazio."</string>
+    <string name="proxy_error_invalid_host">"O nome de host digitado não é válido."</string>
+    <string name="proxy_error_empty_port">"Você deve completar o campo de porta."</string>
+    <string name="proxy_error_empty_host_set_port">"O campo da porta deverá estar vazio se o campo do host estiver vazio."</string>
     <string name="proxy_error_invalid_port">"A porta digitada não é válida."</string>
     <string name="radio_info_signal_location_label">"Local:"</string>
-    <string name="radio_info_neighboring_location_label">"CID próximo:"</string>
+    <string name="radio_info_neighboring_location_label">"CID vizinho:"</string>
     <string name="radio_info_data_attempts_label">"Tentativas de dados:"</string>
     <string name="radio_info_gprs_service_label">"Serviço GPRS:"</string>
     <string name="radio_info_roaming_label">"Roaming:"</string>
     <string name="radio_info_imei_label">"IMEI:"</string>
-    <string name="radio_info_call_redirect_label">"Redirecionamento de chamada:"</string>
-    <string name="radio_info_ppp_resets_label">"Número de redefinições de PPP desde a inicialização:"</string>
+    <string name="radio_info_call_redirect_label">"Redirecionamento da chamada:"</string>
+    <string name="radio_info_ppp_resets_label">"Número de redefinições PPP desde a inicialização:"</string>
     <string name="radio_info_gsm_disconnects_label">"Desconexões GSM:"</string>
     <string name="radio_info_current_network_label">"Rede atual:"</string>
-    <string name="radio_info_data_successes_label">"Êxitos dos dados"</string>
+    <string name="radio_info_data_successes_label">"Êxito dos dados:"</string>
     <string name="radio_info_ppp_received_label">"PPP recebido:"</string>
     <string name="radio_info_gsm_service_label">"Serviço GSM:"</string>
-    <string name="radio_info_signal_strength_label">"Força do sinal:"</string>
+    <string name="radio_info_signal_strength_label">"Potência do sinal:"</string>
     <string name="radio_info_call_status_label">"Status da chamada:"</string>
     <string name="radio_info_ppp_sent_label">"PPP enviado:"</string>
-    <string name="radio_info_radio_resets_label">"Redefinições do rádio:"</string>
+    <string name="radio_info_radio_resets_label">"Redefinições de rádio:"</string>
     <string name="radio_info_message_waiting_label">"Mensagem em espera:"</string>
     <string name="radio_info_phone_number_label">"Número de telefone:"</string>
-    <string name="radio_info_band_mode_label">"Selecione banda de rádio"</string>
+    <string name="radio_info_band_mode_label">"Selecionar frequência de rádio"</string>
     <string name="radio_info_network_type_label">"Tipo de rede:"</string>
-    <string name="radio_info_set_perferred_label">"Definir tipo de rede preferida:"</string>
-    <string name="radio_info_ping_ipaddr">"Executar ping em IpAddr:"</string>
-    <string name="radio_info_ping_hostname">"Executar ping no nome do host (www.google.com):"</string>
-    <string name="radio_info_http_client_test">"Teste de cliente HTTP:"</string>
-    <string name="radio_info_toggle_ciph_label">"Alternar decodificação"</string>
+    <string name="radio_info_set_perferred_label">"Definir tipo de rede preferido:"</string>
+    <string name="radio_info_ping_ipaddr">"Aplicar ping em IpAddr:"</string>
+    <string name="radio_info_ping_hostname">"Aplicar ping no nome do host (www.google.com):"</string>
+    <string name="radio_info_http_client_test">"Teste do Cliente HTTP:"</string>
+    <string name="radio_info_toggle_ciph_label">"Ativar/desativar criptografia"</string>
     <string name="ping_test_label">"Executar teste de ping"</string>
     <string name="radio_info_smsc_label">"SMSC:"</string>
     <string name="radio_info_smsc_update_label">"Atualizar"</string>
     <string name="radio_info_smsc_refresh_label">"Atualizar"</string>
-    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
-    <skip />
-    <string name="band_mode_title">"Definir banda GSM/UMTS"</string>
-    <string name="band_mode_loading">"Carregando lista de bandas…"</string>
+    <string name="radio_info_toggle_dns_check_label">"Ativar/desativar verificação de DNS"</string>
+    <string name="band_mode_title">"Definir frequência GSM/UMTS"</string>
+    <string name="band_mode_loading">"Carregando a lista de frequências…"</string>
     <string name="band_mode_set">"Definir"</string>
-    <string name="band_mode_failed">"Sem êxito"</string>
+    <string name="band_mode_failed">"Falha"</string>
     <string name="band_mode_succeeded">"Êxito"</string>
-    <string name="sdcard_changes_instructions">"As alterações ocorrem quando o cabo USB é reconectado"</string>
-    <string name="sdcard_settings_screen_mass_storage_text">"Ativar armazenamento em massa de USB"</string>
-    <string name="sdcard_settings_total_bytes_label">"Total  de bytes:"</string>
-    <string name="sdcard_settings_not_present_status">"Não há cartão SD"</string>
+    <string name="sdcard_changes_instructions">"As alterações são aplicadas quando o cabo USB é reconectado."</string>
+    <string name="sdcard_settings_screen_mass_storage_text">"Ativar o armazenamento USB em massa"</string>
+    <string name="sdcard_settings_total_bytes_label">"Total de bytes:"</string>
+    <string name="sdcard_settings_not_present_status">"Nenhum cartão SD"</string>
     <string name="sdcard_settings_available_bytes_label">"Bytes disponíveis:"</string>
-    <string name="sdcard_settings_mass_storage_status">"O cartão SD está sendo usado como um dispositivo de armazenamento em massa"</string>
-    <string name="sdcard_settings_unmounted_status">"Agora é seguro remover o cartão SD"</string>
-    <string name="sdcard_settings_bad_removal_status">"O cartão SD foi removido durante o uso."</string>
+    <string name="sdcard_settings_mass_storage_status">"O cartão SD está sendo usado como um dispositivo de armazenamento em massa."</string>
+    <string name="sdcard_settings_unmounted_status">"O cartão SD já pode ser removido com segurança."</string>
+    <string name="sdcard_settings_bad_removal_status">"O cartão SD foi removido enquanto ainda estava em uso!"</string>
     <string name="sdcard_settings_used_bytes_label">"Bytes usados:"</string>
-    <string name="sdcard_settings_scanning_status">"Examinando o cartão SD em busca de mídia…"</string>
+    <string name="sdcard_settings_scanning_status">"Verificando a existência de mídia no cartão SD…"</string>
     <string name="sdcard_settings_read_only_status">"Cartão SD montado como somente leitura"</string>
-    <string name="next_label">"Avançar"</string>
+    <string name="next_label">"Próximo"</string>
     <string name="language_picker_title">"Localidade"</string>
-    <string name="select_your_language">"Selecione seu idioma"</string>
-    <string name="activity_picker_label">"Selecione a atividade"</string>
+    <string name="select_your_language">"Selecionar o seu idioma"</string>
+    <string name="activity_picker_label">"Selecionar atividade"</string>
     <string name="device_info_label">"Informações do dispositivo"</string>
-    <string name="battery_info_label">"Informações sobre a bateria"</string>
-    <!-- no translation found for battery_history_label (8242244969757414501) -->
-    <skip />
-    <string name="display_label">"Exibição"</string>
+    <string name="battery_info_label">"Informações da bateria"</string>
+    <string name="battery_history_label">"Histórico da bateria"</string>
+    <string name="display_label">"Tela"</string>
     <string name="phone_info_label">"Informações do telefone"</string>
     <string name="sd_card_settings_label">"Cartão SD"</string>
     <string name="proxy_settings_label">"Configurações de proxy"</string>
     <string name="cancel">"Cancelar"</string>
     <string name="settings_label">"Configurações"</string>
+    <!-- no translation found for settings_shortcut (3672145147925639262) -->
+    <skip />
     <string name="airplane_mode">"Modo avião"</string>
     <string name="airplane_mode_summary">"Desativar todas as conexões sem fio"</string>
-    <string name="airplane_mode_turning_on">"Desativando conexões sem fio…"</string>
-    <string name="airplane_mode_turning_off">"Ativando as conexões sem fio…"</string>
+    <string name="airplane_mode_turning_on">"Desativando as conexões sem fio…"</string>
+    <string name="airplane_mode_turning_off">"Ativando conexões sem fio…"</string>
     <string name="radio_controls_title">"Controles sem fio"</string>
-    <string name="radio_controls_summary">"Gerenciar Wi-Fi, Bluetooth, modo avião &amp; redes móveis"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
     <!-- no translation found for roaming (3596055926335478572) -->
     <skip />
     <!-- no translation found for roaming_enable (3737380951525303961) -->
@@ -220,73 +219,74 @@
     <skip />
     <!-- no translation found for sum_carrier_select (6648929373316748020) -->
     <skip />
-    <string name="date_and_time_settings_title">"Data &amp; hora"</string>
-    <string name="date_and_time_settings_summary">"Definir data, hora, fuso horário &amp; formatos"</string>
+    <string name="date_and_time_settings_title">"Data e hora"</string>
+    <string name="date_and_time_settings_summary">"Definir data, hora, fuso horário e formatos"</string>
     <string name="date_time_auto">"Automático"</string>
-    <string name="date_time_auto_summaryOn">"Use valores fornecidos pela rede"</string>
-    <string name="date_time_auto_summaryOff">"Use valores fornecidos pela rede"</string>
-    <string name="date_time_24hour">"Use formato de 24 horas"</string>
-    <string name="date_time_set_time">"Definir tempo"</string>
-    <string name="date_time_set_timezone">"Selecione fuso horário"</string>
+    <string name="date_time_auto_summaryOn">"Usar valores fornecidos pela rede"</string>
+    <string name="date_time_auto_summaryOff">"Usar valores fornecidos pela rede"</string>
+    <string name="date_time_24hour">"Usar formato de 24 horas"</string>
+    <string name="date_time_set_time">"Definir data e hora"</string>
+    <string name="date_time_set_timezone">"Selecionar fuso horário"</string>
     <string name="date_time_set_date">"Definir data"</string>
-    <string name="date_time_date_format">"Selecione o formato de datas"</string>
-    <string name="zone_list_menu_sort_alphabetically">"Classificar alfabeticamente"</string>
+    <string name="date_time_date_format">"Selecionar formato de data"</string>
+    <string name="zone_list_menu_sort_alphabetically">"Classificar em ordem alfabética"</string>
     <string name="zone_list_menu_sort_by_timezone">"Classificar por fuso horário"</string>
-    <string name="security_settings_title">"Segurança &amp; local"</string>
-    <string name="security_settings_summary">"Definir Meu local, desbloqueio de tela, bloqueio do cartão SIM"</string>
+    <string name="security_settings_title">"Segurança e local"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"Senhas"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Ativar Bluetooth"</string>
     <string name="bluetooth_settings">"Configurações de Bluetooth"</string>
     <string name="bluetooth_settings_title">"Configurações de Bluetooth"</string>
-    <string name="bluetooth_settings_summary">"Gerenciar conexões, definir o nome &amp; possibilidade de detecção do dispositivo"</string>
-    <string name="bluetooth_pin_entry">"Solicitação de pareamento de Bluetooth"</string>
+    <string name="bluetooth_settings_summary">"Gerenciar conexões, definir o nome e detecção do dispositivo"</string>
+    <string name="bluetooth_pin_entry">"Solicitação de pareamento Bluetooth"</string>
     <string name="bluetooth_device_info">"Informações do dispositivo Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Digite o PIN para realizar o pareamento."\n"(tente 0000 ou 1234)."</string>
+    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Digite o PIN para parear"\n"(tente 0000 ou 1234)."</string>
     <string name="bluetooth_error_title">"Atenção"</string>
-    <string name="bluetooth_pairing_error_message">"Ocorreu um problema ao parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message">"Ocorreu um problema ao parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g> porque o PIN digitado está incorreto."</string>
+    <string name="bluetooth_pairing_error_message">"Houve um problema no pareamento com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message">"Houve um problema ao parear com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, porque o PIN digitado está incorreto."</string>
     <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
     <skip />
     <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
     <skip />
-    <string name="bluetooth_connecting_error_message">"Ocorreu um problema ao conectar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_preference_scan_title">"Examinar em busca de dispositivos"</string>
+    <string name="bluetooth_connecting_error_message">"Houve um problema na conexão com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_preference_scan_title">"Verificar a existência de dispositivos"</string>
     <string name="bluetooth_device_context_connect">"Conectar"</string>
     <string name="bluetooth_device_context_disconnect">"Desconectar"</string>
     <string name="bluetooth_device_context_pair_connect">"Parear e conectar"</string>
     <string name="bluetooth_device_context_unpair">"Cancelar pareamento"</string>
     <string name="bluetooth_device_context_disconnect_unpair">"Desconectar e cancelar pareamento"</string>
-    <string name="bluetooth_device_context_connect_advanced">"Opções..."</string>
-    <string name="bluetooth_connect_specific_profiles_title">"Conectar a…"</string>
+    <string name="bluetooth_device_context_connect_advanced">"Opções…"</string>
+    <string name="bluetooth_connect_specific_profiles_title">"Conectar-se a..."</string>
     <string name="bluetooth_profile_a2dp">"Mídia"</string>
     <string name="bluetooth_profile_headset">"Telefone"</string>
     <string name="bluetooth_summary_connected_to_a2dp">"Conectado ao áudio da mídia"</string>
     <string name="bluetooth_summary_connected_to_headset">"Conectado ao áudio do telefone"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset">"Conectado ao áudio do telefone e da mídia"</string>
-    <string name="bluetooth_device_advanced_title">"opções de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_device_advanced_title">"Opções de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_device_advanced_online_mode_title">"Conectar"</string>
-    <string name="bluetooth_device_advanced_online_mode_summary">"Conectar ao dispositivo Bluetooth"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary">"Conecta ao dispositivo Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title">"Perfis"</string>
     <string name="bluetooth_a2dp_profile_summary_connected">"Conectado ao áudio da mídia"</string>
     <string name="bluetooth_headset_profile_summary_connected">"Conectado ao áudio do telefone"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for">"Usar para áudio da mídia"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for">"Usar para áudio de mídia"</string>
     <string name="bluetooth_headset_profile_summary_use_for">"Usar para áudio do telefone"</string>
     <string name="wifi">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary">"Ativar Wi-Fi"</string>
     <string name="wifi_settings">"Configurações de Wi-Fi"</string>
     <string name="wifi_settings_category">"Configurações de Wi-Fi"</string>
-    <string name="wifi_settings_summary">"Configurar &amp; gerenciar pontos de acesso"</string>
+    <string name="wifi_settings_summary">"Configurar e gerenciar pontos de acesso sem fio"</string>
     <string name="forget_network">"Esquecer"</string>
     <string name="wifi_status">"Status"</string>
     <string name="wifi_link_speed">"Velocidade"</string>
     <string name="wifi_signal_3">"Excelente"</string>
     <string name="wifi_signal_2">"Bom"</string>
-    <string name="wifi_signal_1">"Regular"</string>
+    <string name="wifi_signal_1">"Bom"</string>
     <string name="wifi_signal_0">"Ruim"</string>
     <string name="security">"Segurança"</string>
-    <string name="wifi_security_open">"Abrir"</string>
+    <string name="wifi_security_open">"Aberta"</string>
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
@@ -295,26 +295,30 @@
     <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
     <skip />
     <string name="wifi_security_unknown">"Desconhecido"</string>
-    <string name="wifi_security_verbose_open">"Abrir rede"</string>
-    <string name="wifi_security_verbose_wep">"Protegida com WEP"</string>
-    <string name="wifi_security_verbose_wpa">"Protegido com WPA"</string>
-    <string name="wifi_security_verbose_wpa2">"Protegido com WPA2"</string>
-    <!-- no translation found for wifi_security_verbose_wpa_eap (1317942027527749734) -->
+    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
     <skip />
-    <!-- no translation found for wifi_security_verbose_ieee8021x (5123465248429588738) -->
+    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
     <skip />
     <string name="ip_address">"Endereço IP"</string>
-    <string name="signal">"Força do sinal"</string>
+    <string name="signal">"Potência do sinal"</string>
     <string name="wifi_starting">"Ativando…"</string>
-    <string name="wifi_stopping">"Desligando…"</string>
+    <string name="wifi_stopping">"Desativando…"</string>
     <string name="wifi_error">"Erro"</string>
-    <string name="error_starting">"Não é possível iniciar a Wi-Fi"</string>
-    <string name="error_stopping">"Não é possível interromper a Wi-Fi"</string>
-    <string name="error_scanning">"Não é possível examinar em busca de novas redes"</string>
-    <string name="error_connecting">"Não é possível se conectar à rede"</string>
+    <string name="error_starting">"Não é possível iniciar o Wi-Fi"</string>
+    <string name="error_stopping">"Não é possível parar o Wi-Fi"</string>
+    <string name="error_scanning">"Não é possível verificar a existência de redes"</string>
+    <string name="error_connecting">"Não é possível se conectar à rede."</string>
     <string name="error_saving">"Não é possível salvar a rede"</string>
     <string name="connect">"Conectar"</string>
-    <string name="connect_to_blank">"Conectar a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_to_blank">"Conectar-se a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <!-- no translation found for please_select_eap (4488240331626456338) -->
     <skip />
     <!-- no translation found for please_select_phase2 (5231074529772044898) -->
@@ -327,27 +331,26 @@
     <skip />
     <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
     <skip />
-    <!-- no translation found for please_select_private_key (1804364378555255180) -->
-    <skip />
     <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
     <skip />
-    <string name="please_type_passphrase">"Senha da rede sem fio"</string>
-    <string name="please_type_hex_key">"Chave hexadecimal WEP (0-9, A-F)"</string>
+    <string name="please_type_passphrase">"Senha sem fio"</string>
+    <string name="please_type_hex_key">"Chave hexadecimal WEP (0 a 9, A a F)"</string>
     <string name="wifi_show_password">"Mostrar senha."</string>
-    <string name="scan_wifi">"Examinar"</string>
-    <string name="summary_not_in_range">"Não está dentro da faixa"</string>
-    <string name="summary_remembered">"Recordado"</string>
-    <string name="summary_connection_failed">"Falha de conexão, selecione para tentar novamente"</string>
+    <string name="scan_wifi">"Verificar"</string>
+    <string name="summary_not_in_range">"Não está dentro do alcance"</string>
+    <!-- no translation found for summary_remembered (6079941090549401742) -->
+    <skip />
+    <string name="summary_connection_failed">"Falha na conexão. Selecione para tentar novamente"</string>
     <string name="wifi_access_points">"Redes Wi-Fi"</string>
-    <string name="wifi_type_ssid">"SSID de rede"</string>
+    <string name="wifi_type_ssid">"SSID da rede"</string>
     <string name="wifi_security">"Segurança"</string>
     <string name="wifi_save_config">"Salvar"</string>
-    <string name="wifi_password_unchanged">"(inalterado)"</string>
+    <string name="wifi_password_unchanged">"(não alterado)"</string>
     <string name="wifi_add_other_network">"Adicionar rede Wi-Fi"</string>
     <string name="wifi_notify_open_networks">"Notificação de rede"</string>
-    <string name="wifi_notify_open_networks_summary">"Notifique-me quando uma rede aberta estiver disponível"</string>
-    <string name="wifi_password_incorrect_error">"A senha de rede digitada não está correta. Tente novamente."</string>
-    <string name="wifi_generic_connection_error">"Há um problema de conexão com a rede. Tente novamente."</string>
+    <string name="wifi_notify_open_networks_summary">"Receber notificação quando uma rede aberta estiver disponível"</string>
+    <string name="wifi_password_incorrect_error">"A senha da rede digitada não está correta. Tente novamente."</string>
+    <string name="wifi_generic_connection_error">"Há um problema na conexão com a rede. Tente novamente."</string>
     <string name="wifi_menu_advanced">"Avançado"</string>
     <string name="wifi_ip_settings_titlebar">"Configurações de IP"</string>
     <string name="wifi_ip_settings_menu_save">"Salvar"</string>
@@ -359,155 +362,145 @@
     <string name="wifi_dns2">"DNS 2"</string>
     <string name="wifi_gateway">"Gateway"</string>
     <string name="wifi_netmask">"Máscara de rede"</string>
-    <string name="wifi_context_menu_connect">"Conectar à rede"</string>
-    <string name="wifi_context_menu_forget">"Esquecer rede"</string>
+    <string name="wifi_context_menu_connect">"Conectar-se à rede"</string>
+    <string name="wifi_context_menu_forget">"Esquecer a rede"</string>
     <string name="wifi_context_menu_change_password">"Alterar senha"</string>
     <string name="wifi_advanced_titlebar">"Avançado"</string>
-    <string name="wifi_setting_num_channels_title">"Domínio controlador"</string>
-    <string name="wifi_setting_num_channels_summary">"Defina o número de canais para uso"</string>
-    <string name="wifi_setting_num_channels_error">"Houve um problema com a configuração do domínio controlador."</string>
+    <string name="wifi_setting_num_channels_title">"Domínio regulatório"</string>
+    <string name="wifi_setting_num_channels_summary">"Definir o número de canais a serem usados"</string>
+    <string name="wifi_setting_num_channels_error">"Houve um problema ao configurar o domínio regulatório."</string>
     <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> canais"</string>
-    <!-- no translation found for wifi_setting_sleep_policy_title (1367731352485585528) -->
-    <skip />
-    <!-- no translation found for wifi_setting_sleep_policy_summary (7573693311804602041) -->
-    <skip />
-    <!-- no translation found for wifi_setting_sleep_policy_error (5103670439972135148) -->
-    <skip />
+    <string name="wifi_setting_sleep_policy_title">"Política de inatividade de Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_summary">"Especificar quando alternar de Wi-Fi para dados móveis"</string>
+    <string name="wifi_setting_sleep_policy_error">"Houve um problema ao configurar a política de inatividade"</string>
     <string name="wifi_advanced_mac_address_title">"Endereço MAC"</string>
-    <string name="fragment_status_scanning">"Examinando…"</string>
-    <string name="fragment_status_connecting">"Conectando a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
-    <string name="fragment_status_authenticating">"Autenticando com <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_scanning">"Verificando…"</string>
+    <string name="fragment_status_connecting">"Conectando-se a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_authenticating">"Autenticando com a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
     <string name="fragment_status_obtaining_ip">"Obtendo endereço IP da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
-    <string name="fragment_status_connected">"Conectado ao <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
-    <string name="fragment_status_disconnecting">"Desconectando de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_connected">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="fragment_status_disconnecting">"Desconectando da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
     <string name="fragment_status_disconnected">"Desconectado"</string>
-    <string name="fragment_status_failed">"Sem êxito"</string>
-    <string name="status_scanning">"Examinando…"</string>
-    <string name="status_connecting">"Conectando…"</string>
-    <string name="status_authenticating">"Autenticando…"</string>
-    <string name="status_obtaining_ip">"Obtendo endereço…"</string>
+    <string name="fragment_status_failed">"Falha"</string>
+    <string name="status_scanning">"Verificando…"</string>
+    <string name="status_connecting">"Conectando..."</string>
+    <string name="status_authenticating">"Autenticando..."</string>
+    <string name="status_obtaining_ip">"Obtendo o endereço…"</string>
     <string name="status_connected">"Conectado"</string>
     <string name="status_disconnecting">"Desconectando…"</string>
     <string name="status_disconnected">"Desconectado"</string>
-    <string name="status_failed">"Sem êxito"</string>
-    <string name="sound_and_display_settings">"Som &amp; tela"</string>
+    <string name="status_failed">"Falha"</string>
+    <string name="sound_and_display_settings">"Som e tela"</string>
     <string name="sound_settings">"Configurações de som"</string>
-    <string name="sound_and_display_settings_summary">"Definir ringtones, notificações, brilho da tela"</string>
+    <string name="sound_and_display_settings_summary">"Definir toques, notificações, brilho da tela"</string>
     <string name="silent_mode_title">"Modo silencioso"</string>
-    <string name="silent_mode_summary">"Todos os sons, exceto mídia e alarmes, são silenciados"</string>
-    <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
-    <skip />
-    <string name="ringtone_title">"Ringtone do telefone"</string>
-    <string name="ringtone_summary">"Defina seu ringtone padrão de chamada recebida"</string>
+    <string name="silent_mode_summary">"Todos os sons, exceto de mídia e alarmes, são silenciados."</string>
+    <string name="silent_mode_incl_alarm_summary">"Todos os sons, exceto de mídia, estão silenciados"</string>
+    <string name="ringtone_title">"Toque do telefone"</string>
+    <string name="ringtone_summary">"Definir o seu toque padrão para chamada recebida"</string>
     <string name="ring_volume_title">"Volume da campainha"</string>
     <string name="ring_volume_summary">"Definir volume para chamadas recebidas e notificações"</string>
-    <string name="vibrate_title">"Telefone vibra"</string>
+    <string name="vibrate_title">"Vibrar telefone"</string>
     <string name="vibrate_summary">"Vibrar o telefone para chamadas recebidas"</string>
-    <string name="notification_sound_title">"Ringtone de notificação"</string>
-    <string name="notification_sound_summary">"Definir seu ringtone de notificação padrão"</string>
+    <string name="notification_sound_title">"Toque de notificação"</string>
+    <string name="notification_sound_summary">"Definir o seu toque de notificação padrão"</string>
     <string name="incoming_call_volume_title">"Volume da chamada recebida"</string>
     <string name="notification_volume_title">"Volume da notificação"</string>
-    <string name="checkbox_notification_same_as_incoming_call">"Usar volume das chamadas recebidas para notificações"</string>
-    <string name="notification_sound_dialog_title">"Selecione o ringtone de notificação"</string>
+    <string name="checkbox_notification_same_as_incoming_call">"Usar volume de chamada recebida para notificações"</string>
+    <string name="notification_sound_dialog_title">"Selecionar toque de notificação"</string>
     <string name="media_volume_title">"Volume da mídia"</string>
-    <string name="media_volume_summary">"Configurar volume para música e vídeos"</string>
-    <string name="dtmf_tone_enable_title">"Tons de toque audíveis"</string>
-    <string name="dtmf_tone_enable_summary_on">"Reproduzir tons ao usar o teclado"</string>
-    <string name="dtmf_tone_enable_summary_off">"Reproduzir tons ao usar o teclado"</string>
+    <string name="media_volume_summary">"Definir o volume para música e vídeos"</string>
+    <string name="dtmf_tone_enable_title">"Sons de toque audíveis"</string>
+    <string name="dtmf_tone_enable_summary_on">"Reproduzir sons ao usar o teclado"</string>
+    <string name="dtmf_tone_enable_summary_off">"Reproduzir sons ao usar o teclado"</string>
     <string name="sound_effects_enable_title">"Seleção audível"</string>
-    <string name="sound_effects_enable_summary_on">"Reproduzir som ao fazer seleção de tela"</string>
-    <string name="sound_effects_enable_summary_off">"Reproduzir som ao fazer seleção de tela"</string>
-    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <string name="sound_effects_enable_summary_on">"Reproduzir som ao fazer uma seleção de tela"</string>
+    <string name="sound_effects_enable_summary_off">"Reproduzir som ao fazer uma seleção de tela"</string>
+    <string name="play_media_notification_sounds_enable_title">"Notificações do cartão SD"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
     <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
     <skip />
     <string name="sync_settings">"Sincronização de dados"</string>
-    <string name="sync_settings_summary">"Selecione quais aplicativos serão sincronizados"</string>
+    <string name="sync_settings_summary">"Selecionar os aplicativos que serão sincronizados"</string>
     <!-- no translation found for search_settings (1910951467596035063) -->
     <skip />
-    <!-- no translation found for search_settings_summary (3736000832072784654) -->
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
     <skip />
-    <string name="display_settings">"Exibir configurações"</string>
+    <string name="display_settings">"Configurações da tela"</string>
     <string name="animations_title">"Animação"</string>
-    <!-- no translation found for animations_summary_on (8843613112130484436) -->
-    <skip />
-    <!-- no translation found for animations_summary_off (2777026828025551983) -->
-    <skip />
-    <!-- no translation found for accelerometer_title (6183763368844793276) -->
-    <skip />
-    <!-- no translation found for accelerometer_summary_on (1133737282813048021) -->
-    <skip />
-    <!-- no translation found for accelerometer_summary_off (5485489363715740761) -->
-    <skip />
+    <string name="animations_summary_on">"Mostrar animação ao abrir e fechar janelas"</string>
+    <string name="animations_summary_off">"Mostrar animação ao abrir e fechar janelas"</string>
+    <string name="accelerometer_title">"Orientação"</string>
+    <string name="accelerometer_summary_on">"Alternar orientação automaticamente ao girar o telefone"</string>
+    <string name="accelerometer_summary_off">"Alternar orientação automaticamente ao girar o telefone"</string>
     <string name="brightness">"Brilho"</string>
-    <!-- no translation found for brightness_summary (838917350127550703) -->
-    <skip />
-    <string name="screen_timeout">"Tempo esgotado da tela"</string>
-    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
-    <skip />
+    <string name="brightness_summary">"Ajustar o brilho da tela"</string>
+    <string name="screen_timeout">"Tempo limite da tela"</string>
+    <string name="screen_timeout_summary">"Ajuste depois de quanto tempo a tela será desligada automaticamente"</string>
     <string name="sim_lock_settings">"Configurações de bloqueio do cartão SIM"</string>
     <string name="sim_lock_settings_category">"Configurar bloqueio do cartão SIM"</string>
     <string name="sim_lock_settings_title">"Bloqueio do cartão SIM"</string>
     <string name="sim_pin_toggle">"Bloquear cartão SIM"</string>
-    <string name="sim_lock_on">"Requer PIN para usar o telefone"</string>
-    <string name="sim_lock_off">"Requer PIN para usar o telefone"</string>
+    <string name="sim_lock_on">"Exigir PIN para usar o telefone"</string>
+    <string name="sim_lock_off">"Exigir PIN para usar o telefone"</string>
     <string name="sim_pin_change">"Alterar PIN do SIM"</string>
     <string name="sim_enter_pin">"PIN do SIM"</string>
     <string name="sim_enable_sim_lock">"Bloquear cartão SIM"</string>
-    <string name="sim_disable_sim_lock">"Desbloquear cartão SIM"</string>
+    <string name="sim_disable_sim_lock">"Desbloquear o cartão SIM"</string>
     <string name="sim_enter_old">"PIN do SIM antigo"</string>
-    <string name="sim_enter_new">"PIN do novo SIM"</string>
-    <string name="sim_reenter_new">"Digite novamente o novo PIN"</string>
+    <string name="sim_enter_new">"Novo PIN do SIM"</string>
+    <string name="sim_reenter_new">"Digitar novamente o novo PIN"</string>
     <string name="sim_change_pin">"PIN do SIM"</string>
     <string name="sim_bad_pin">"PIN incorreto."</string>
-    <string name="sim_pins_dont_match">"Os PINs não correspondem."</string>
+    <string name="sim_pins_dont_match">"Os PINs não correspondem!"</string>
     <string name="sim_change_failed">"Não é possível alterar o PIN."\n"PIN possivelmente incorreto."</string>
-    <string name="sim_change_succeeded">"PIN do SIM alterado com êxito"</string>
+    <string name="sim_change_succeeded">"PIN do SIM alterado"</string>
     <string name="sim_lock_failed">"Não é possível alterar o estado de bloqueio do cartão SIM."\n"PIN possivelmente incorreto."</string>
     <string name="sim_enter_ok">"OK"</string>
     <string name="sim_enter_cancel">"Cancelar"</string>
     <string name="device_info_settings">"Status do telefone"</string>
     <string name="system_update_settings_list_item_title">"Atualizações do sistema"</string>
-    <string name="system_update_settings_list_item_summary">"Verificar as atualização do sistema"</string>
+    <string name="system_update_settings_list_item_summary">"Verificar a existência de atualizações do sistema"</string>
     <string name="firmware_version">"Versão do firmware"</string>
     <string name="model_number">"Número do modelo"</string>
     <string name="baseband_version">"Versão da banda de base"</string>
     <string name="kernel_version">"Versão do kernel"</string>
-    <string name="build_number">"Número da compilação"</string>
+    <string name="build_number">"Número da versão"</string>
     <string name="device_info_not_available">"Não disponível"</string>
     <string name="device_status_activity_title">"Status"</string>
     <string name="device_status">"Status"</string>
-    <string name="device_status_summary">"IMEI, número de telefone, sinal etc."</string>
-    <string name="storage_settings_title">"Cartão SD &amp; armazenamento do telefone"</string>
-    <string name="storage_settings_summary">"Cartão SD sem nome, exibir armazenamento disponível"</string>
-    <string name="status_number">"Número de telefone"</string>
-    <!-- no translation found for status_network_type (3279383550222116235) -->
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
+    <string name="storage_settings_title">"Cartão SD e armazenamento do telefone"</string>
+    <string name="storage_settings_summary">"Desmontar o cartão SD, visualizar armazenamento disponível"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
     <skip />
-    <!-- no translation found for status_data_state (5503181397066522950) -->
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
     <skip />
+    <string name="status_network_type">"Tipo de rede móvel"</string>
+    <string name="status_data_state">"Estado da rede móvel"</string>
     <string name="status_service_state">"Estado do serviço"</string>
-    <string name="status_signal_strength">"Força do sinal"</string>
+    <string name="status_signal_strength">"Potência do sinal"</string>
     <string name="status_roaming">"Roaming"</string>
     <string name="status_operator">"Rede"</string>
-    <string name="status_wifi_mac_address">"Endereço MAC Wi-Fi"</string>
+    <string name="status_wifi_mac_address">"Endereço MAC da rede Wi-Fi"</string>
     <string name="status_bt_address">"Endereço Bluetooth"</string>
     <string name="status_unavailable">"Não disponível"</string>
-    <string name="status_up_time">"Tempo de funcionamento"</string>
-    <string name="status_awake_time">"Tempo de atividade"</string>
+    <string name="status_up_time">"Tempo de atividade"</string>
+    <string name="status_awake_time">"Tempo de ativação"</string>
     <string name="internal_memory">"Armazenamento interno do telefone"</string>
     <string name="sd_memory">"Cartão SD"</string>
     <string name="memory_available">"Espaço disponível"</string>
     <string name="memory_size">"Espaço total"</string>
-    <!-- no translation found for sd_eject (6915293408836853020) -->
-    <skip />
-    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
-    <skip />
-    <!-- no translation found for sd_format (5448738337382712203) -->
-    <skip />
-    <!-- no translation found for sd_format_summary (6616491027883134004) -->
-    <skip />
+    <string name="sd_eject">"Desmontar cartão SD"</string>
+    <string name="sd_eject_summary">"Desmontar o cartão SD para remoção segura"</string>
+    <string name="sd_format">"Formatar cartão SD"</string>
+    <string name="sd_format_summary">"Formatar (apagar) o cartão SD"</string>
     <string name="sd_unavailable">"Não disponível"</string>
     <string name="read_only">" (Somente leitura)"</string>
     <string name="battery_status_title">"Status da bateria"</string>
@@ -534,138 +527,132 @@
     <string name="menu_cancel">"Descartar"</string>
     <string name="error_title">"Atenção"</string>
     <string name="error_name_empty">"O campo Nome não pode ficar vazio."</string>
-    <string name="error_apn_empty">"O APN não pode ser vazio."</string>
+    <string name="error_apn_empty">"O APN não pode estar vazio."</string>
     <string name="error_mcc_not3">"O campo MCC deve ter 3 dígitos."</string>
-    <string name="error_mnc_not23">"Campo MNC deve ter 2 ou 3 dígitos."</string>
-    <!-- no translation found for restore_default_apn (2724583218635739913) -->
-    <skip />
-    <!-- no translation found for menu_restore (8260067415075573273) -->
-    <skip />
-    <!-- no translation found for restore_default_apn_completed (3990449939234957281) -->
-    <skip />
-    <string name="master_clear_title">"Redefinição de dados da fábrica"</string>
+    <string name="error_mnc_not23">"O campo MNC deve ter 2 ou 3 dígitos."</string>
+    <string name="restore_default_apn">"Restaurando as configurações APN padrão"</string>
+    <string name="menu_restore">"Redefinir para o padrão"</string>
+    <string name="restore_default_apn_completed">"Redefinição das configurações padrão do APN concluída"</string>
+    <string name="master_clear_title">"Redefinir configuração original"</string>
     <string name="master_clear_summary">"Apaga todos os dados no telefone"</string>
-    <string name="master_clear_desc">"Esta ação redefinirá o estado de fábrica do telefone, apagando todos os dados e aplicativos baixados."</string>
-    <string name="master_clear_button_text">"Reiniciar o telefone"</string>
-    <string name="master_clear_final_desc">"Reiniciar o telefone, apagando todos os dados e aplicativos? Essa ação não pode ser revertida."</string>
-    <string name="master_clear_final_button_text">"Apagar tudo"</string>
-    <string name="master_clear_gesture_prompt">"Desenhar seu padrão de desbloqueio"</string>
-    <string name="master_clear_gesture_explanation">"Você deve desenhar seu padrão de desbloqueio para confirmar a reinicialização de um telefone."</string>
-    <string name="master_clear_failed">"Nenhuma reinicialização foi realizada, pois o serviço System Clear não está disponível."</string>
-    <!-- no translation found for media_format_title (4671276096695789895) -->
-    <skip />
-    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
     <skip />
-    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <string name="master_clear_button_text">"Redefinir telefone"</string>
+    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
     <skip />
-    <!-- no translation found for media_format_button_text (370856400090190151) -->
-    <skip />
-    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <string name="master_clear_final_button_text">"Apagar tudo"</string>
+    <string name="master_clear_gesture_prompt">"Desenhe o seu padrão de desbloqueio"</string>
+    <string name="master_clear_gesture_explanation">"Você precisa desenhar o seu padrão de desbloqueio para confirmar uma redefinição de telefone."</string>
+    <string name="master_clear_failed">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
+    <string name="media_format_title">"Formatar cartão SD."</string>
+    <string name="media_format_summary">"Apaga todos os dados no cartão SD"</string>
+    <string name="media_format_desc">"Esta ação apagará o cartão SD no telefone. Você perderá TODOS os dados do cartão!"</string>
+    <string name="media_format_button_text">"Formatar cartão SD"</string>
+    <string name="media_format_final_desc">"Formatar cartão SD, apagando toda a sua mídia? A ação não pode ser revertida!"</string>
+    <string name="media_format_final_button_text">"Apagar tudo"</string>
+    <string name="media_format_gesture_prompt">"Desenhe o seu padrão de desbloqueio"</string>
+    <string name="media_format_gesture_explanation">"Você deve desenhar o seu padrão de desbloqueio para confirmar a formatação de um cartão SD."</string>
+    <string name="call_settings_title">"Configurações de chamada"</string>
+    <string name="call_settings_summary">"Configurar o correio de voz, o encaminhamento de chamada, a chamada em espera, o ID do chamador"</string>
+    <string name="network_settings_title">"Redes móveis"</string>
+    <string name="network_settings_summary">"Definir opções para roaming, redes, APNs"</string>
+    <!-- no translation found for location_title (1029961368397484576) -->
     <skip />
-    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <string name="location_network_based">"Usar redes sem fio"</string>
+    <string name="location_networks_disabled">"Veja o local nos aplicativos (como o Google Maps) usando redes sem fio"</string>
+    <string name="location_neighborhood_level">"Local determinado pela rede Wi-Fi e/ou pelas redes móveis"</string>
+    <string name="location_gps">"Ativar satélites GPS"</string>
+    <string name="location_street_level">"Durante a localização, a precisão chega no nível de rua (desmarque a seleção para conservar a bateria)"</string>
+    <string name="location_gps_disabled">"Localizar no nível da rua (exige mais bateria e visão do céu)"</string>
+    <!-- no translation found for use_location_title (7585990952633568732) -->
     <skip />
-    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <!-- no translation found for use_location_summary (4411467143899877395) -->
     <skip />
-    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
     <skip />
-    <string name="call_settings_title">"Configurações da chamada"</string>
-    <string name="call_settings_summary">"Configurar correio de voz, transferência de chamada, chamada em espera, ID do chamador"</string>
-    <string name="network_settings_title">"Redes móveis"</string>
-    <string name="network_settings_summary">"Definir opções para roaming, redes e APNs"</string>
-    <string name="location_title">"Fontes de Meu local"</string>
-    <string name="location_network_based">"Usar redes sem fio"</string>
-    <string name="location_networks_disabled">"Consulte o local nos aplicativos (como Mapas) usando redes sem fio"</string>
-    <string name="location_neighborhood_level">"Local determinado pelas redes Wi-Fi e/ou móvel"</string>
-    <string name="location_gps">"Ativar satélites GPS"</string>
-    <string name="location_street_level">"Ao localizar, defina a precisão para nível de rua (retire a seleção de economia da bateria)"</string>
-    <string name="location_gps_disabled">"Localizar no nível da rua (exige mais bateria e vista do céu)"</string>
+    <string name="agree">"Concordo"</string>
+    <string name="disagree">"Não concordo"</string>
     <string name="about_settings">"Sobre o telefone"</string>
-    <string name="about_settings_summary">"Exibir informações jurídicos, status do telefone, versão do software"</string>
-    <string name="legal_information">"Informações jurídicas"</string>
+    <string name="about_settings_summary">"Ver informações legais, status do telefone, versão do software"</string>
+    <string name="legal_information">"Informações legais"</string>
     <string name="contributors_title">"Colaboradores"</string>
     <string name="copyright_title">"Direitos autorais"</string>
     <string name="license_title">"Licença"</string>
-    <string name="terms_title">"Termos e condições"</string>
-    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
-    <skip />
-    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <string name="terms_title">"Termos e Condições"</string>
+    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
     <skip />
-    <string name="settings_license_activity_title">"Abrir licenças da fonte"</string>
-    <string name="settings_license_activity_unavailable">"Há um problema com o carregamento das licenças."</string>
-    <string name="settings_license_activity_loading">"Carregando…"</string>
+    <string name="system_tutorial_list_item_summary">"Aprenda a usar o seu telefone"</string>
+    <string name="settings_license_activity_title">"Licenças de código aberto"</string>
+    <string name="settings_license_activity_unavailable">"Há um problema ao carregar as licenças."</string>
+    <string name="settings_license_activity_loading">"Carregando..."</string>
     <string name="lock_settings_title">"Padrão de desbloqueio da tela"</string>
     <string name="lockpattern_change_lock_pattern_label">"Alterar padrão de desbloqueio"</string>
     <string name="lockpattern_need_to_unlock">"Confirmar padrão salvo"</string>
-    <string name="lockpattern_need_to_unlock_wrong">"Sentimos muito, tente novamente:"</string>
-    <string name="lockpattern_recording_intro_header">"Desenhar um padrão de desbloqueio"</string>
+    <string name="lockpattern_need_to_unlock_wrong">"Tente novamente:"</string>
+    <string name="lockpattern_recording_intro_header">"Desenhe um padrão de desbloqueio"</string>
     <string name="lockpattern_recording_intro_footer">"Pressione Menu para obter ajuda."</string>
-    <string name="lockpattern_recording_inprogress">"Solte o dedo ao concluir."</string>
-    <string name="lockpattern_recording_incorrect_too_short">"Ligue no mínimo <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente:"</string>
+    <string name="lockpattern_recording_inprogress">"Solte o dedo quando terminar."</string>
+    <string name="lockpattern_recording_incorrect_too_short">"Conectar no mínimo <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente:"</string>
     <string name="lockpattern_pattern_entered_header">"Padrão registrado."</string>
-    <string name="lockpattern_need_to_confirm">"Desenhar padrão novamente para confirmar:"</string>
+    <string name="lockpattern_need_to_confirm">"Desenhe o padrão novamente para confirmar:"</string>
     <string name="lockpattern_pattern_confirmed_header">"Seu novo padrão de desbloqueio:"</string>
     <string name="lockpattern_confirm_button_text">"Confirmar"</string>
-    <string name="lockpattern_restart_button_text">"Redesenhar"</string>
+    <string name="lockpattern_restart_button_text">"Desenhar novamente"</string>
     <string name="lockpattern_retry_button_text">"Tentar novamente"</string>
     <string name="lockpattern_continue_button_text">"Continuar"</string>
     <string name="lockpattern_settings_title">"Padrão de desbloqueio"</string>
-    <string name="lockpattern_settings_enable_title">"Exige o padrão"</string>
-    <string name="lockpattern_settings_enable_summary">"Deve desenhar o padrão para desbloquear a tela"</string>
+    <string name="lockpattern_settings_enable_title">"Exigir padrão"</string>
+    <string name="lockpattern_settings_enable_summary">"É necessário desenhar o padrão para desbloquear a tela"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title">"Usar padrão visível"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title">"Usar leitura tátil"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"Usar feedback táctil"</string>
     <string name="lockpattern_settings_choose_lock_pattern">"Definir padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern">"Alterar padrão de desbloqueio"</string>
     <string name="lockpattern_settings_help_how_to_record">"Como desenhar um padrão de desbloqueio"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Muitas tentativas incorretas."</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Tentar novamente em <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Muitas tentativas incorretas!"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Tente novamente em <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="skip_button_label">"Cancelar"</string>
-    <string name="next_button_label">"Avançar"</string>
-    <string name="lock_title">"Proteção do seu telefone"</string>
-    <string name="lock_intro_message"><font size="17">"Proteja o telefone contra o uso inadequado criando um padrão de desbloqueio de tela pessoal. "\n<font height="17">\n</font><b>"1"</b>"  Na próxima tela, observe enquanto um exemplo de padrão é desenhado. "\n<font height="17">\n</font><b>"2"</b>"  Quando estiver pronto, desenhe seu próprio padrão de desbloqueio. Experimente padrões diferentes, mas ligue no mínimo quatro pontos. "\n<font height="17">\n</font><b>"3"</b>"  Desenhe seu padrão novamente para confirmar. "\n<font height="17">\n</font><b>"Pronto para começar? Selecione “Avançar”"</b>". "\n<font height="3">\n</font>"Para deixar seu telefone desprotegido, selecione “Cancelar”."</font></string>
+    <string name="next_button_label">"Próximo"</string>
+    <string name="lock_title">"Protegendo o seu telefone"</string>
+    <string name="lock_intro_message"><font size="17">"Proteja o seu telefone contra o uso não autorizado criando um padrão de desbloqueio de tela pessoal. "\n<font height="17">\n</font><b>"1"</b>"  Na próxima tela, observe enquanto um exemplo de padrão é desenhado. "\n<font height="17">\n</font><b>"2"</b>"  Quando estiver pronto, desenhe o seu próprio padrão de desbloqueio pessoal. Experimente padrões diferentes, mas conecte no mínimo quatro pontos. "\n<font height="17">\n</font><b>"3"</b>"  Desenhe novamente o seu padrão para confirmar. "\n<font height="17">\n</font><b>"Pronto para começar? Selecione “Próximo”"</b>". "\n<font height="3">\n</font>"Para deixar o seu telefone sem proteção, selecione “Cancelar”."</font></string>
     <string name="lock_example_title">"Exemplo de padrão"</string>
-    <string name="lock_example_message">"Ligue no mínimo quatro pontos."\n" "\n"Selecione “Avançar” quando estiver pronto para desenhar seu próprio padrão."</string>
+    <string name="lock_example_message">"Conecte no mínimo quatro pontos."\n" "\n"Selecione “Próximo” quando estiver pronto para desenhar o seu próprio padrão."</string>
     <string name="manageapplications_settings_title">"Gerenciar aplicativos"</string>
-    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
-    <skip />
+    <string name="manageapplications_settings_summary">"Gerenciar e remover aplicativos instalados"</string>
     <string name="applications_settings">"Aplicativos"</string>
     <string name="applications_settings_summary">"Gerenciar aplicativos, configurar atalhos de inicialização rápida"</string>
     <string name="applications_settings_header">"Configurações do aplicativo"</string>
     <string name="install_applications">"Fontes desconhecidas"</string>
     <string name="install_unknown_applications">"Permite a instalação de aplicativos que não são do Market"</string>
-    <string name="install_all_warning">"Seu telefone e dados pessoais são mais vulneráveis ao ataque de aplicativos de fontes desconhecidas. Você concorda que é totalmente responsável por qualquer dano causado ao seu telefone ou pela perda de dados que possa resultar do uso desses aplicativos."</string>
-    <string name="application_info_label">"Informações sobre o aplicativo"</string>
+    <string name="install_all_warning">"Os dados do seu telefone e os dados pessoais estão mais vulneráveis a ataques de aplicativos de fontes desconhecidas. Você concorda que é o único responsável por qualquer dano causado ao seu telefone ou pela perda de dados que possa resultar do uso desses aplicativos."</string>
+    <string name="application_info_label">"Informações do aplicativo"</string>
     <string name="storage_label">"Armazenamento"</string>
     <string name="auto_launch_label">"Iniciar por padrão"</string>
     <string name="permissions_label">"Permissões"</string>
     <string name="cache_header_label">"Cache"</string>
     <string name="clear_cache_btn_text">"Limpar cache"</string>
     <string name="cache_size_label">"Cache"</string>
-    <!-- no translation found for controls_label (7611113077086853799) -->
-    <skip />
-    <!-- no translation found for force_stop (7435006169872876756) -->
-    <skip />
+    <string name="controls_label">"Controles"</string>
+    <string name="force_stop">"Forçar parada"</string>
     <string name="total_size_label">"Total"</string>
     <string name="application_size_label">"Aplicativo"</string>
     <string name="data_size_label">"Dados"</string>
     <string name="uninstall_text">"Desinstalar"</string>
     <string name="clear_user_data_text">"Limpar dados"</string>
-    <!-- no translation found for app_factory_reset (7167892023319924674) -->
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
     <skip />
-    <string name="auto_launch_enable_text">"Você selecionou iniciar este aplicativo por padrão para usar algumas ações."</string>
+    <string name="auto_launch_enable_text">"Você selecionou a inicialização padrão deste aplicativo para algumas ações."</string>
     <string name="auto_launch_disable_text">"Nenhum padrão definido."</string>
-    <string name="clear_activities">"Limpar padrões"</string>
+    <string name="clear_activities">"Limpar padrão"</string>
     <string name="unknown">"Desconhecido"</string>
     <string name="sort_order_alpha">"Classificar"</string>
     <string name="sort_order_size">"Classificar por tamanho"</string>
-    <string name="manage_space_text">"Gerenciar o espaço"</string>
-    <!-- no translation found for filter (2018011724373033887) -->
-    <skip />
-    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
-    <skip />
-    <string name="filter_apps_all">"Tudo"</string>
+    <string name="manage_space_text">"Gerenciar espaço"</string>
+    <string name="filter">"Filtro"</string>
+    <string name="filter_dlg_title">"Selecionar as opções de filtro"</string>
+    <string name="filter_apps_all">"Todos"</string>
     <string name="filter_apps_third_party">"Terceiros"</string>
     <string name="filter_apps_running">"Em execução"</string>
-    <string name="loading">"Carregando…"</string>
+    <string name="loading">"Carregando..."</string>
     <string name="recompute_size">"Recalculando o tamanho…"</string>
     <string name="clear_data_dlg_title">"Excluir"</string>
     <string name="clear_data_dlg_text">"Todas as informações salvas neste aplicativo serão excluídas permanentemente."</string>
@@ -674,234 +661,244 @@
     <string name="app_not_found_dlg_title">"Aplicativo não encontrado"</string>
     <string name="app_not_found_dlg_text">"O aplicativo não foi encontrado na lista de aplicativos instalados."</string>
     <string name="clear_data_failed">"Não é possível limpar os dados do aplicativo."</string>
-    <!-- no translation found for app_factory_reset_dlg_title (4370229555040541055) -->
+    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
     <skip />
-    <!-- no translation found for app_factory_reset_dlg_text (1183261746385587974) -->
+    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
     <skip />
     <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
     <skip />
     <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
     <skip />
-    <string name="security_settings_desc">"Este aplicativo pode acessar os seguintes itens em seu telefone:"</string>
-    <!-- no translation found for computing_size (1599186977475211186) -->
-    <skip />
+    <string name="security_settings_desc">"Este aplicativo pode acessar os seguintes itens no seu telefone:"</string>
+    <string name="computing_size">"Calculando…"</string>
     <string name="invalid_size_value">"Não é possível calcular o tamanho do pacote"</string>
-    <string name="empty_list_msg">"Você não possui nenhum aplicativo de terceiros instalado."</string>
+    <string name="empty_list_msg">"Você não tem aplicativos de terceiros instalados."</string>
     <!-- no translation found for version_text (9189073826278676425) -->
     <skip />
-    <string name="language_settings">"Localidade &amp; texto"</string>
-    <string name="language_settings_summary">"Definir opções de localidade (idioma e região), entrada de texto e correção automática"</string>
+    <string name="language_settings">"Localidade e texto"</string>
+    <string name="language_settings_summary">"Definir as opções de localidade (idioma e região), de entrada texto e de correção automática"</string>
     <string name="language_category">"Configuração de localidade"</string>
     <string name="text_category">"Configurações de texto"</string>
-    <string name="phone_language">"Selecione a localidade"</string>
-    <!-- no translation found for phone_language_summary (1809580675831352352) -->
-    <skip />
+    <string name="phone_language">"Selecionar a localidade"</string>
+    <string name="phone_language_summary">"Selecionar o idioma e a região"</string>
     <string name="auto_replace">"Substituição automática"</string>
-    <string name="auto_replace_summary">"Corrigir palavras com erro de digitação"</string>
-    <string name="auto_caps">"Capitalização automática"</string>
-    <string name="auto_caps_summary">"Colocar a primeira letra das frases em maiúscula"</string>
+    <string name="auto_replace_summary">"Corrigir palavras digitadas incorretamente"</string>
+    <string name="auto_caps">"Iniciar com letra maiúscula automaticamente"</string>
+    <string name="auto_caps_summary">"Escrever a primeira letra nas sentenças com letra maiúscula"</string>
     <string name="auto_punctuate">"Pontuação automática"</string>
-    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
-    <skip />
-    <string name="auto_punctuate_summary">"Pressione a tecla Espaço duas vezes para inserir \".\""</string>
+    <string name="hardkeyboard_category">"Configurações de teclado físico"</string>
+    <string name="auto_punctuate_summary">"Pressione a tecla de Espaço duas vezes para inserir \".\""</string>
     <string name="show_password">"Senhas visíveis"</string>
-    <string name="show_password_summary">"Mostrar a senha enquanto digita"</string>
-    <!-- no translation found for ime_security_warning (3458652708716006477) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_titlebar (765659257455000490) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_title (8357027437499042191) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_summary (2460427065601355471) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_add_menu_title (4056762757149923551) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_add_dialog_title (4702613990174126482) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_edit_dialog_title (8967476444840548674) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_context_menu_edit_title (2210564879320004837) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_context_menu_delete_title (9140703913776549054) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_empty_text (6209268025109242806) -->
-    <skip />
-    <string name="testing">"Teste"</string>
+    <string name="show_password_summary">"Mostrar senha ao digitar"</string>
+    <string name="ime_security_warning">"Este método de entrada pode coletar todo o texto que você digitar, incluindo dados pessoais como senhas e números de cartão de crédito. Ele é proveniente do aplicativo <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Ativar este método de entrada?"</string>
+    <string name="user_dict_settings_titlebar">"Dicionário do usuário"</string>
+    <string name="user_dict_settings_title">"Dicionário do usuário"</string>
+    <string name="user_dict_settings_summary">"Adicionar e remover palavras do dicionário do usuário"</string>
+    <string name="user_dict_settings_add_menu_title">"Adicionar"</string>
+    <string name="user_dict_settings_add_dialog_title">"Adicionar ao dicionário"</string>
+    <string name="user_dict_settings_edit_dialog_title">"Editar palavra"</string>
+    <string name="user_dict_settings_context_menu_edit_title">"Editar"</string>
+    <string name="user_dict_settings_context_menu_delete_title">"Excluir"</string>
+    <string name="user_dict_settings_empty_text">"Você não possui palavras no dicionário do usuário. Você pode adicionar uma palavra por meio do menu."</string>
+    <string name="testing">"Testando"</string>
     <string name="testing_phone_info">"Informações do telefone"</string>
     <string name="testing_battery_info">"Informações da bateria"</string>
-    <!-- no translation found for testing_battery_history (3043329445810695647) -->
-    <skip />
-    <string name="quick_launch_title">"Inicialização rápida"</string>
-    <string name="quick_launch_summary">"Define os atalhos do teclado para iniciar os aplicativos"</string>
+    <string name="testing_battery_history">"Histórico da bateria"</string>
+    <string name="quick_launch_title">"Início rápido"</string>
+    <string name="quick_launch_summary">"Define atalhos do teclado para iniciar aplicativos"</string>
     <string name="quick_launch_assign_application">"Atribuir aplicativo"</string>
     <string name="quick_launch_no_shortcut">"Sem atalho"</string>
-    <string name="quick_launch_shortcut">"Procurar + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
+    <string name="quick_launch_shortcut">"Pesquisar + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title">"Limpar"</string>
-    <string name="quick_launch_clear_dialog_message">"O atalho para <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) será apagado."</string>
+    <string name="quick_launch_clear_dialog_message">"O seu atalho para <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) será apagado."</string>
     <string name="quick_launch_clear_ok_button">"OK"</string>
     <string name="quick_launch_clear_cancel_button">"Cancelar"</string>
     <string name="quick_launch_display_mode_applications">"Aplicativos"</string>
     <string name="quick_launch_display_mode_shortcuts">"Atalhos"</string>
     <string name="input_methods_settings_title">"Entrada de texto"</string>
     <string name="input_methods_settings_summary">"Gerenciar opções de entrada de texto"</string>
-    <!-- no translation found for input_methods_settings_label_format (6002887604815693322) -->
-    <skip />
-    <!-- no translation found for onscreen_keyboard_settings_summary (4919680715154885028) -->
-    <skip />
-    <!-- no translation found for builtin_keyboard_settings_title (8169889453770863227) -->
-    <skip />
-    <!-- no translation found for builtin_keyboard_settings_summary (6404687907454621637) -->
-    <skip />
+    <string name="input_methods_settings_label_format">"Configurações de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="onscreen_keyboard_settings_summary">"Configurações do teclado virtual"</string>
+    <string name="builtin_keyboard_settings_title">"Teclado do dispositivo"</string>
+    <string name="builtin_keyboard_settings_summary">"Configurações de teclado integrado"</string>
     <string name="development_settings_title">"Desenvolvimento"</string>
-    <string name="development_settings_summary">"Definir opções para o desenvolvimento de aplicativos"</string>
+    <string name="development_settings_summary">"Define as opções para o desenvolvimento do aplicativo"</string>
     <string name="enable_adb">"Depuração USB"</string>
-    <string name="enable_adb_summary">"Modo de depuração quando o USB está conectado"</string>
+    <string name="enable_adb_summary">"Modo de depuração quando o USB estiver conectado"</string>
     <string name="keep_screen_on">"Permanecer ativo"</string>
-    <string name="keep_screen_on_summary">"A tela nunca repousará durante o carregamento"</string>
-    <string name="allow_mock_location">"Permitir imitação de localização"</string>
-    <string name="allow_mock_location_summary">"Permitir imitação de localização"</string>
-    <!-- no translation found for gadget_picker_title (98374951396755811) -->
-    <skip />
-    <!-- no translation found for widget_picker_title (9130684134213467557) -->
-    <skip />
-    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
-    <skip />
-    <!-- no translation found for battery_history_uid (1016606150528436298) -->
-    <skip />
-    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
-    <skip />
-    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
-    <skip />
-    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
-    <skip />
-    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
-    <skip />
-    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
-    <skip />
-    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
-    <skip />
-    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <string name="keep_screen_on_summary">"A tela nunca entrará no modo de inatividade enquanto estiver carregando."</string>
+    <string name="allow_mock_location">"Permitir locais fictícios"</string>
+    <string name="allow_mock_location_summary">"Permitir locais fictícios"</string>
+    <!-- no translation found for adb_warning_title (1756027479229533250) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (5352555112049663033) -->
+    <skip />
+    <string name="gadget_picker_title">"Escolher o gadget"</string>
+    <string name="widget_picker_title">"Escolher widget"</string>
+    <string name="battery_history_details_for">"Detalhes do UID %d"</string>
+    <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
+    <string name="battery_history_network_usage">"Detalhes do uso da rede do <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
+    <string name="battery_history_bytes_received">"Bytes recebidos: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_sent">"Bytes enviados: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_total">"Total de bytes: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_cpu_usage">"Detalhes do uso de CPU para <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
+    <string name="battery_history_user_time">"Tempo do usuário:"</string>
+    <string name="battery_history_system_time">"Tempo do sistema:"</string>
+    <string name="battery_history_total_time">"Tempo total:"</string>
+    <string name="battery_history_starts">"Inicia: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
+    <string name="battery_history_packages_sharing_this_uid">"Pacotes que compartilham este UID:"</string>
+    <string name="battery_history_no_data">"Não há dados de uso da bateria disponíveis"</string>
+    <string name="battery_history_sensor">"Sensor:"</string>
+    <string name="battery_history_wakelock">"Bloqueio de ativação parcial:"</string>
+    <string name="battery_history_used_by_packages">"Sensor usado por pacotes:"</string>
+    <string name="battery_history_sensor_usage">"Usado <xliff:g id="COUNT">%1$d</xliff:g> vezes por <xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
+    <string name="battery_history_sensor_usage_multi">"Usado <xliff:g id="COUNT">%1$d</xliff:g> vezes por um de:"</string>
+    <string name="battery_history_awake_label">"Em execução"</string>
+    <string name="battery_history_screen_on_label">"Tela ativada"</string>
+    <string name="battery_history_phone_on_label">"Telefone ativado"</string>
+    <string name="battery_history_awake">"Tempo gasto quando ativo:"</string>
+    <string name="battery_history_screen_on">"Tempo gasto com a tela ativada:"</string>
+    <string name="battery_history_phone_on">"Tempo gasto com o telefone ativado:"</string>
+    <string name="battery_history_screen_on_battery">"Na bateria:"</string>
+    <string name="battery_history_screen_on_plugged">"Conectado:"</string>
+    <string name="usage_stats_label">"Estatísticas de uso"</string>
+    <string name="testing_usage_stats">"Estatísticas de uso"</string>
+    <string name="display_order_text">"Classificar por:"</string>
+    <string name="app_name_label">"Aplicativo"</string>
+    <string name="launch_count_label">"Contagem"</string>
+    <string name="usage_time_label">"Tempo de uso"</string>
+    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
     <skip />
-    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
     <skip />
-    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
     <skip />
-    <!-- no translation found for battery_history_days (7820397518485221829) -->
+    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
     <skip />
-    <!-- no translation found for battery_history_hours (102352608746026227) -->
+    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
     <skip />
-    <!-- no translation found for battery_history_minutes (5344879003050455195) -->
+    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
     <skip />
-    <!-- no translation found for battery_history_seconds (761623624964984375) -->
+    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
     <skip />
-    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
     <skip />
-    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
     <skip />
-    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
     <skip />
-    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
     <skip />
-    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
     <skip />
-    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <!-- no translation found for awake (387122265874485088) -->
     <skip />
-    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <!-- no translation found for wifi_on_time (4630925382578609056) -->
     <skip />
-    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
     <skip />
-    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <!-- no translation found for usage_name_percent (1899151069711662289) -->
     <skip />
-    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <!-- no translation found for details_title (7564809986329021063) -->
     <skip />
-    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <!-- no translation found for details_subtitle (32593908269911734) -->
     <skip />
-    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
     <skip />
-    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
     <skip />
-    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <!-- no translation found for power_screen (2353149143338929583) -->
     <skip />
-    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <!-- no translation found for power_wifi (2382791137776486974) -->
     <skip />
-    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
     <skip />
-    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <!-- no translation found for power_cell (6596471490976003056) -->
     <skip />
-    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <!-- no translation found for power_phone (5392641106474567277) -->
     <skip />
-    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <!-- no translation found for power_idle (9055659695602194990) -->
     <skip />
-    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
     <skip />
-    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
     <skip />
-    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
     <skip />
-    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
     <skip />
-    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
+    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
     <skip />
-    <!-- no translation found for enable_accessibility_service_summary (587346887866360112) -->
+    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
     <skip />
-    <!-- no translation found for disable_accessibility_service_summary (3712100338753526029) -->
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
     <skip />
-    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
     <skip />
-    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
+    <!-- no translation found for usage_type_on_time (7052979399415080971) -->
     <skip />
-    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
     <skip />
-    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
+    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
     <skip />
-    <!-- no translation found for power_usage_summary_title (6299347977868560167) -->
+    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
     <skip />
-    <!-- no translation found for battery_since_unplugged (7650779969628963056) -->
+    <!-- no translation found for battery_action_display (5302763261448580102) -->
     <skip />
-    <!-- no translation found for battery_since_reset (8921307141345382144) -->
+    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
     <skip />
-    <!-- no translation found for awake (387122265874485088) -->
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
     <skip />
-    <!-- no translation found for wifi_on_time (4630925382578609056) -->
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
     <skip />
-    <!-- no translation found for details_title (7884781172929635971) -->
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
     <skip />
-    <!-- no translation found for details_subtitle (5086639882427527064) -->
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
     <skip />
-    <!-- no translation found for controls_subtitle (3218143829900515242) -->
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
     <skip />
-    <!-- no translation found for power_screen (1513495511309040704) -->
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
     <skip />
-    <!-- no translation found for power_wifi (1185503168440278173) -->
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
     <skip />
-    <!-- no translation found for power_cell (4633684550964059948) -->
+    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
     <skip />
-    <!-- no translation found for power_phone (8900576354902742370) -->
+    <!-- no translation found for battery_sugg_wifi (3003604969548979254) -->
     <skip />
-    <!-- no translation found for power_idle (9036717846023423658) -->
+    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
     <skip />
-    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
     <skip />
-    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
     <skip />
-    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
     <skip />
-    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
     <skip />
-    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
+    <!-- no translation found for battery_sugg_apps_gps (1834412555123982714) -->
     <skip />
-    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
+    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
     <skip />
-    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
     <skip />
-    <!-- no translation found for usage_type_video (4295357792078579944) -->
-    <skip />
-    <!-- no translation found for menu_stats_unplugged (7775586751038490112) -->
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
     <skip />
     <!-- no translation found for menu_stats_total (8973377864854807854) -->
     <skip />
     <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
     <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
     <!-- no translation found for tts_settings (6454363854545277027) -->
     <skip />
     <!-- no translation found for tts_settings_summary (2627715231944602766) -->
@@ -922,8 +919,228 @@
     <skip />
     <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
     <skip />
-    <!-- no translation found for tts_available_synths_section (5787033928850926152) -->
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_demo (405357591189935876) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
     <skip />
     <!-- no translation found for gadget_title (7455548605888590466) -->
     <skip />
+    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
+    <skip />
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
+    <skip />
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
+    <skip />
+    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
+    <skip />
+    <!-- no translation found for vpn_no_button (7620339571187119107) -->
+    <skip />
+    <!-- no translation found for vpn_back_button (192036339792734970) -->
+    <skip />
+    <!-- no translation found for vpn_mistake_button (1759404628590603933) -->
+    <skip />
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <!-- no translation found for vpn_connecting (8039521381692090116) -->
+    <skip />
+    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
+    <skip />
+    <!-- no translation found for vpn_connected (7641723116362845781) -->
+    <skip />
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 85e6fa9..efbd1af 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -30,23 +30,34 @@
     <item>"1 минута"</item>
     <item>"2 минуты"</item>
     <item>"10 минут"</item>
-    <item>"Не выключать"</item>
-  </string-array>
-  <string-array name="wifi_security_entries">
-    <item>"Автоматически"</item>
-    <item>"Нет"</item>
-    <item>"WEP"</item>
-    <item>"WPA Personal"</item>
-    <item>"WPA2 Personal"</item>
-  </string-array>
-  <string-array name="wifi_security_without_auto_entries">
-    <item>"Нет"</item>
-    <item>"WEP"</item>
-    <item>"WPA Personal"</item>
-    <item>"WPA2 Personal"</item>
+    <item>"Не отключать"</item>
   </string-array>
+    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
+    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
+    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
+    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
+    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
+    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
+    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
+    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
+    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
+    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
+    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
+    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
+    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
+    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
+    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
+    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
+    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
+    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
+    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
+    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
+    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
+    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
+    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
+    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
-    <item>"Автоматически"</item>
+    <item>"Авто"</item>
     <item>"WEP ASCII"</item>
     <item>"Шестнадцатеричный WEP"</item>
   </string-array>
@@ -73,4 +84,15 @@
     <item>"Начать подсчет"</item>
     <item>"Название приложения"</item>
   </string-array>
+    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
+    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
+    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
+    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
+    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
+    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
+    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
+    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ee7d1dc..f465add 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -16,354 +16,417 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Неизвестно"</string>
-    <string name="turn_on_radio">"Включить радиосвязь"</string>
-    <string name="turn_off_radio">"Отключить радиосвязь"</string>
-    <string name="turn_on_qxdm">"Включить журнал QXDM SD"</string>
-    <string name="turn_off_qxdm">"Отключить журнал QXDM SD"</string>
-    <string name="radioInfo_menu_viewADN">"Просмотреть адресную книгу SIM-карты"</string>
-    <string name="radioInfo_menu_viewFDN">"Просмотр номеров с фиксированным набором"</string>
-    <string name="radioInfo_menu_viewSDN">"Просмотр служебных номеров"</string>
+    <string name="turn_on_radio">"Включить радио"</string>
+    <string name="turn_off_radio">"Отключить радио"</string>
+    <string name="turn_on_qxdm">"Включить SD-журнал QXDM"</string>
+    <string name="turn_off_qxdm">"Отключить SD-журнал QXDM"</string>
+    <string name="radioInfo_menu_viewADN">"Просмотреть адресную книгу на SIM-карте"</string>
+    <string name="radioInfo_menu_viewFDN">"Просмотреть список разрешенных номеров"</string>
+    <string name="radioInfo_menu_viewSDN">"Просмотреть номера служебного набора"</string>
     <string name="radioInfo_menu_getPDP">"Получить список PDP"</string>
-    <string name="radioInfo_menu_enableData">"Разрешить подключение для передачи данных"</string>
-    <string name="radioInfo_menu_disableData">"Выключить подключение к данным"</string>
+    <string name="radioInfo_menu_enableData">"Включить подключение для передачи данных"</string>
+    <string name="radioInfo_menu_disableData">"Отключить подключение для передачи данных"</string>
     <string name="radioInfo_menu_enableDataOnBoot">"Включить данные при загрузке"</string>
     <string name="radioInfo_menu_disableDataOnBoot">"Отключить данные при загрузке"</string>
-    <string name="radioInfo_service_in">"В зоне обслуживания"</string>
+    <string name="radioInfo_service_in">"Обслуживается"</string>
     <string name="radioInfo_service_out">"Вне зоны обслуживания"</string>
-    <string name="radioInfo_service_emergency">"Только экстренные вызовы"</string>
-    <string name="radioInfo_service_off">"Радиосвязь отключена"</string>
+    <string name="radioInfo_service_emergency">"Только вызовы службы экстренной помощи"</string>
+    <string name="radioInfo_service_off">"Радио отключено"</string>
     <string name="radioInfo_roaming_in">"Роуминг"</string>
-    <string name="radioInfo_roaming_not">"Не в роуминге"</string>
-    <string name="radioInfo_phone_idle">"Ожидание"</string>
+    <string name="radioInfo_roaming_not">"Без роуминга"</string>
+    <string name="radioInfo_phone_idle">"Не работает"</string>
     <string name="radioInfo_phone_ringing">"Звонок"</string>
-    <string name="radioInfo_phone_offhook">"Вызов выполняется"</string>
+    <string name="radioInfo_phone_offhook">"Посылка вызова"</string>
     <string name="radioInfo_data_disconnected">"Отключено"</string>
     <string name="radioInfo_data_connecting">"Подключение"</string>
     <string name="radioInfo_data_connected">"Подключено"</string>
     <string name="radioInfo_data_suspended">"Приостановлено"</string>
     <string name="radioInfo_unknown">"неизвестно"</string>
-    <string name="radioInfo_display_packets">"пак."</string>
+    <string name="radioInfo_display_packets">"pkts"</string>
     <string name="radioInfo_display_bytes">"байт"</string>
-    <string name="radioInfo_display_dbm">"дБм"</string>
+    <string name="radioInfo_display_dbm">"dBm"</string>
     <string name="radioInfo_display_asu">"asu"</string>
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
-    <string name="sdcard_unmount">"Отключиться от карты SD"</string>
+    <string name="sdcard_unmount">"Демонтировать карту SD"</string>
     <string name="sdcard_format">"Форматировать карту SD"</string>
     <string name="small_font">"Мелкий"</string>
-    <string name="medium_font">"Средний"</string>
+    <string name="medium_font">"Среднее"</string>
     <string name="large_font">"Крупный"</string>
     <string name="font_size_save">"ОК"</string>
-    <string name="sdcard_setting">"Карта SD"</string>
+    <string name="sdcard_setting">"SD-карта"</string>
     <string name="battery_info_status_label">"Состояние батареи:"</string>
     <string name="battery_info_scale_label">"Шкала батареи:"</string>
     <string name="battery_info_level_label">"Уровень заряда батареи:"</string>
-    <string name="battery_info_health_label">"Состояние батареи:"</string>
+    <string name="battery_info_health_label">"Уровень заряда батареи:"</string>
     <string name="battery_info_technology_label">"Технология батареи:"</string>
     <string name="battery_info_voltage_label">"Напряжение батареи:"</string>
     <string name="battery_info_voltage_units">"мВ"</string>
     <string name="battery_info_temperature_label">"Температура батареи:"</string>
     <string name="battery_info_temperature_units">"° C"</string>
-    <string name="battery_info_uptime">"Время с момента загрузки:"</string>
-    <string name="battery_info_awake_battery">"Время действия от батареи:"</string>
-    <string name="battery_info_awake_plugged">"Время активности при зарядке:"</string>
-    <string name="battery_info_screen_on">"Время включения экрана:"</string>
+    <string name="battery_info_uptime">"Время после загрузки:"</string>
+    <string name="battery_info_awake_battery">"Время работы от батареи:"</string>
+    <string name="battery_info_awake_plugged">"Время работы при зарядке:"</string>
+    <string name="battery_info_screen_on">"Время работы экрана:"</string>
     <string name="battery_info_status_unknown">"Неизвестно"</string>
-    <string name="battery_info_status_charging">"Зарядка"</string>
-    <string name="battery_info_status_charging_ac">"(AC)"</string>
+    <string name="battery_info_status_charging">"Идет зарядка"</string>
+    <string name="battery_info_status_charging_ac">"(переменный ток)"</string>
     <string name="battery_info_status_charging_usb">"(USB)"</string>
-    <string name="battery_info_status_discharging">"Разрядка"</string>
+    <string name="battery_info_status_discharging">"Разрядка батареи"</string>
     <string name="battery_info_status_not_charging">"Не заряжается"</string>
-    <string name="battery_info_status_full">"Полная"</string>
+    <string name="battery_info_status_full">"Полностью"</string>
     <string name="battery_info_health_unknown">"Неизвестно"</string>
-    <string name="battery_info_health_good">"Достаточная"</string>
+    <string name="battery_info_health_good">"Хорошо"</string>
     <string name="battery_info_health_overheat">"Перегрев"</string>
-    <string name="battery_info_health_dead">"Разряженная"</string>
-    <string name="battery_info_health_over_voltage">"Скачок напряжения"</string>
+    <string name="battery_info_health_dead">"Отключено"</string>
+    <string name="battery_info_health_over_voltage">"Слишком высокое напряжение"</string>
     <string name="battery_info_health_unspecified_failure">"Неизвестная ошибка"</string>
     <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_visibility">"Видно другим"</string>
-    <string name="bluetooth_is_discoverable">"Виден в течение <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> сек…"</string>
+    <string name="bluetooth_visibility">"Видимый"</string>
+    <string name="bluetooth_is_discoverable">"Видимый в течение <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> секунд..."</string>
     <string name="bluetooth_not_discoverable">"Сделать устройство видимым"</string>
     <string name="bluetooth_devices">"Устройства Bluetooth"</string>
-    <string name="bluetooth_device_name">"Название устройства"</string>
-    <string name="bluetooth_name_not_set">"Имя не задано, используется имя аккаунта"</string>
+    <string name="bluetooth_device_name">"Имя устройства"</string>
+    <string name="bluetooth_name_not_set">"Без настройки имени, использовать имя аккаунта"</string>
     <string name="bluetooth_scan_for_devices">"Поиск устройств"</string>
     <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено."</string>
     <string name="bluetooth_connected">"Подключено"</string>
     <string name="bluetooth_disconnected">"Отключено"</string>
-    <string name="bluetooth_disconnecting">"Отключение…"</string>
-    <string name="bluetooth_connecting">"Идет подключение…"</string>
+    <string name="bluetooth_disconnecting">"Отключение..."</string>
+    <string name="bluetooth_connecting">"Подключение..."</string>
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
-    <string name="bluetooth_not_connected">"Создать пару с этим устройством"</string>
-    <string name="bluetooth_pairing">"Идет создание пары..."</string>
-    <string name="bluetooth_paired">"Соединено, но не подключено"</string>
+    <string name="bluetooth_not_connected">"Установить сопряжение с этим устройством"</string>
+    <string name="bluetooth_pairing">"Сопряжение..."</string>
+    <string name="bluetooth_paired">"Сопряжено, но не подключено"</string>
     <string name="bluetooth_device">"гарнитура/наушники"</string>
-    <string name="progress_scanning">"Сканирование"</string>
-    <string name="bluetooth_notif_ticker">"Запрос на соединение Bluetooth"</string>
-    <string name="bluetooth_notif_title">"Запрос на соединение"</string>
-    <string name="bluetooth_notif_message">"Выбрать для соединения "</string>
+    <string name="progress_scanning">"Поиск"</string>
+    <string name="bluetooth_notif_ticker">"Запрос сопряжения Bluetooth"</string>
+    <string name="bluetooth_notif_title">"Запрос на сопряжение"</string>
+    <string name="bluetooth_notif_message">"Выберите для сопряжения с "</string>
     <string name="date_and_time">"Настройки даты и времени"</string>
-    <string name="date_time_12_hour_sample">"13:00"</string>
+    <string name="date_time_12_hour_sample">"1:00 pm"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Изменить время"</string>
+    <string name="date_time_changeDate_text">"Дата"</string>
     <string name="choose_timezone">"Выбрать часовой пояс"</string>
+    <!-- no translation found for normal_date_format (1982904221918374153) -->
+    <skip />
     <string name="display_preview_label">"Предварительный просмотр:"</string>
     <string name="display_font_size_label">"Размер шрифта:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"Отправить <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
-    <string name="intent_sender_startactivity_text">"Запустить <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_startactivity_text">"Начать <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label">"Аккаунт:"</string>
     <string name="proxy_clear_text">"Очистить"</string>
     <string name="proxy_port_label">"Порт"</string>
-    <string name="proxy_defaultView_text">"Восстановить значения по умолчанию"</string>
+    <string name="proxy_defaultView_text">"Восстановить настройки по умолчанию"</string>
     <string name="proxy_action_text">"Сохранить"</string>
     <string name="proxy_hostname_label">"Имя узла"</string>
     <string name="proxy_error">"Внимание"</string>
     <string name="proxy_error_dismiss">"ОК"</string>
-    <string name="proxy_error_invalid_host">"Указано недействительное имя узла."</string>
-    <string name="proxy_error_empty_port">"Нужно заполнить поле порта."</string>
-    <string name="proxy_error_empty_host_set_port">"Если поле хоста пусто, поле порта тоже должно быть пустым."</string>
-    <string name="proxy_error_invalid_port">"Указанный порт недействителен."</string>
+    <string name="proxy_error_invalid_host">"Введено недействительное имя узла."</string>
+    <string name="proxy_error_empty_port">"Необходимо заполнить поле порта."</string>
+    <string name="proxy_error_empty_host_set_port">"Если поле хоста не заполнено, поле порта также следует оставить пустым."</string>
+    <string name="proxy_error_invalid_port">"Введен недействительный порт."</string>
     <string name="radio_info_signal_location_label">"Местоположение:"</string>
-    <string name="radio_info_neighboring_location_label">"CID поблизости:"</string>
+    <string name="radio_info_neighboring_location_label">"Соседний CID:"</string>
     <string name="radio_info_data_attempts_label">"Попыток данных:"</string>
-    <string name="radio_info_gprs_service_label">"Обслуживание GPRS:"</string>
+    <string name="radio_info_gprs_service_label">"Услуга GPRS:"</string>
     <string name="radio_info_roaming_label">"Роуминг:"</string>
     <string name="radio_info_imei_label">"IMEI:"</string>
-    <string name="radio_info_call_redirect_label">"Перенаправление вызова:"</string>
-    <string name="radio_info_ppp_resets_label">"Количество сбросов PPP с момента загрузки:"</string>
-    <string name="radio_info_gsm_disconnects_label">"GSM отключается:"</string>
+    <string name="radio_info_call_redirect_label">"Перенаправление вызовов:"</string>
+    <string name="radio_info_ppp_resets_label">"Количество сбросов PPP после загрузки:"</string>
+    <string name="radio_info_gsm_disconnects_label">"Отключение GSM:"</string>
     <string name="radio_info_current_network_label">"Текущая сеть:"</string>
-    <string name="radio_info_data_successes_label">"Успешные данные:"</string>
+    <string name="radio_info_data_successes_label">"Количество успешных обработок данных:"</string>
     <string name="radio_info_ppp_received_label">"Получено PPP:"</string>
-    <string name="radio_info_gsm_service_label">"Обслуживание GSM:"</string>
-    <string name="radio_info_signal_strength_label">"Уровень сигнала:"</string>
+    <string name="radio_info_gsm_service_label">"Служба GSM:"</string>
+    <string name="radio_info_signal_strength_label">"Громкость сигнала"</string>
     <string name="radio_info_call_status_label">"Состояние вызова:"</string>
     <string name="radio_info_ppp_sent_label">"Отправлено PPP:"</string>
-    <string name="radio_info_radio_resets_label">"Сбросы радиосвязи:"</string>
-    <string name="radio_info_message_waiting_label">"Ожидает сообщение:"</string>
+    <string name="radio_info_radio_resets_label">"Сброс настроек радио:"</string>
+    <string name="radio_info_message_waiting_label">"Параллельное сообщение:"</string>
     <string name="radio_info_phone_number_label">"Номер телефона:"</string>
-    <string name="radio_info_band_mode_label">"Выбор диапазона радиосвязи"</string>
+    <string name="radio_info_band_mode_label">"Выбрать радиостанцию"</string>
     <string name="radio_info_network_type_label">"Тип сети:"</string>
-    <string name="radio_info_set_perferred_label">"Задать предпочитаемый тип сети:"</string>
-    <string name="radio_info_ping_ipaddr">"IP-адрес Ping:"</string>
-    <string name="radio_info_ping_hostname">"Имя узла для ping (www.google.com):"</string>
-    <string name="radio_info_http_client_test">"Проверка HTTP-клиента:"</string>
-    <string name="radio_info_toggle_ciph_label">"Включить шифрование"</string>
-    <string name="ping_test_label">"Выполнить ping"</string>
+    <string name="radio_info_set_perferred_label">"Настроить предпочтительный тип сети:"</string>
+    <string name="radio_info_ping_ipaddr">"Выполнить проверку ping IP-адреса:"</string>
+    <string name="radio_info_ping_hostname">"ping имя узла (www.google.ru):"</string>
+    <string name="radio_info_http_client_test">"Проверка клиента HTTP:"</string>
+    <string name="radio_info_toggle_ciph_label">"Переключить шифрование"</string>
+    <string name="ping_test_label">"Выполнить проверку ping"</string>
     <string name="radio_info_smsc_label">"SMSC:"</string>
     <string name="radio_info_smsc_update_label">"Обновить"</string>
     <string name="radio_info_smsc_refresh_label">"Обновить"</string>
     <string name="radio_info_toggle_dns_check_label">"Выбор проверки DNS"</string>
-    <string name="band_mode_title">"Установить диапазон GSM/UMTS"</string>
-    <string name="band_mode_loading">"Загрузка списка диапазонов…"</string>
-    <string name="band_mode_set">"Установить"</string>
-    <string name="band_mode_failed">"Ошибка"</string>
+    <string name="band_mode_title">"Настроить частоту GSM/UMTS"</string>
+    <string name="band_mode_loading">"Загрузка списка частот..."</string>
+    <string name="band_mode_set">"Настроить"</string>
+    <string name="band_mode_failed">"Сбой"</string>
     <string name="band_mode_succeeded">"Успешно"</string>
-    <string name="sdcard_changes_instructions">"Изменения вступят в силу после повторного подключения кабеля USB"</string>
-    <string name="sdcard_settings_screen_mass_storage_text">"Включить устройство хранения USB"</string>
-    <string name="sdcard_settings_total_bytes_label">"Всего байт:"</string>
-    <string name="sdcard_settings_not_present_status">"Нет карты SD"</string>
-    <string name="sdcard_settings_available_bytes_label">"Доступно байт:"</string>
-    <string name="sdcard_settings_mass_storage_status">"Карта SD используется как устройство хранения данных."</string>
-    <string name="sdcard_settings_unmounted_status">"Теперь можно безопасно извлечь карту SD"</string>
-    <string name="sdcard_settings_bad_removal_status">"Карта SD извлечена во время использования!"</string>
-    <string name="sdcard_settings_used_bytes_label">"Занято, байт:"</string>
-    <string name="sdcard_settings_scanning_status">"Поиск мультимедиа на карте SD…"</string>
-    <string name="sdcard_settings_read_only_status">"Подключение к карте SD только для чтения"</string>
+    <string name="sdcard_changes_instructions">"Изменения вступят в силу после повторного подключения USB-кабеля"</string>
+    <string name="sdcard_settings_screen_mass_storage_text">"Включить массовую память USB"</string>
+    <string name="sdcard_settings_total_bytes_label">"Всего байтов:"</string>
+    <string name="sdcard_settings_not_present_status">"Нет SD-карты"</string>
+    <string name="sdcard_settings_available_bytes_label">"Свободно байтов:"</string>
+    <string name="sdcard_settings_mass_storage_status">"SD-карта используется в качестве устройства массовой памяти"</string>
+    <string name="sdcard_settings_unmounted_status">"SD-карта может быть извлечена"</string>
+    <string name="sdcard_settings_bad_removal_status">"SD-карта была извлечена во время использования!"</string>
+    <string name="sdcard_settings_used_bytes_label">"Использовано байтов:"</string>
+    <string name="sdcard_settings_scanning_status">"Поиск мультимедиа на SD-карте..."</string>
+    <string name="sdcard_settings_read_only_status">"SD-карта установлена только для чтения"</string>
     <string name="next_label">"Далее"</string>
-    <string name="language_picker_title">"Локаль"</string>
+    <string name="language_picker_title">"Региональные настройки"</string>
     <string name="select_your_language">"Выберите язык"</string>
     <string name="activity_picker_label">"Выбрать действие"</string>
     <string name="device_info_label">"Сведения об устройстве"</string>
-    <string name="battery_info_label">"Сведения о батарее"</string>
+    <string name="battery_info_label">"Информация о батарее"</string>
     <string name="battery_history_label">"Журнал сведений о батарее"</string>
-    <string name="display_label">"Экран"</string>
-    <string name="phone_info_label">"Сведения о телефоне"</string>
-    <string name="sd_card_settings_label">"Карта SD"</string>
-    <string name="proxy_settings_label">"Настройки прокси"</string>
+    <string name="display_label">"Показать"</string>
+    <string name="phone_info_label">"Информация о телефоне"</string>
+    <string name="sd_card_settings_label">"SD-карта"</string>
+    <string name="proxy_settings_label">"Настройки прокси-сервера"</string>
     <string name="cancel">"Отмена"</string>
     <string name="settings_label">"Настройки"</string>
+    <!-- no translation found for settings_shortcut (3672145147925639262) -->
+    <skip />
     <string name="airplane_mode">"Режим полета"</string>
-    <string name="airplane_mode_summary">"Отключить все беспроводные подключения"</string>
-    <string name="airplane_mode_turning_on">"Отключение беспроводных соединений…"</string>
+    <string name="airplane_mode_summary">"Отключить все беспроводные соединения"</string>
+    <string name="airplane_mode_turning_on">"Отключение беспроводных соединений..."</string>
     <string name="airplane_mode_turning_off">"Включение беспроводных соединений..."</string>
-    <string name="radio_controls_title">"Управление беспроводной связью"</string>
-    <string name="radio_controls_summary">"Управление Wi-Fi, Bluetooth, режимом полета и мобильными сетями"</string>
+    <string name="radio_controls_title">"Настройки беспроводных модулей"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
     <string name="date_and_time_settings_title">"Дата и время"</string>
-    <string name="date_and_time_settings_summary">"Установка даты, времени, часового пояса и форматов"</string>
+    <string name="date_and_time_settings_summary">"Настроить часовой пояс, форматы даты и времени"</string>
     <string name="date_time_auto">"Автоматически"</string>
-    <string name="date_time_auto_summaryOn">"Использовать значения, предоставленные сетью"</string>
-    <string name="date_time_auto_summaryOff">"Использовать значения, предоставленные сетью"</string>
+    <string name="date_time_auto_summaryOn">"Использовать данные, предоставленные сетью"</string>
+    <string name="date_time_auto_summaryOff">"Использовать данные, предоставленные сетью"</string>
     <string name="date_time_24hour">"Использовать 24-часовой формат"</string>
-    <string name="date_time_set_time">"Выбор времени"</string>
+    <string name="date_time_set_time">"Настроить время"</string>
     <string name="date_time_set_timezone">"Выбрать часовой пояс"</string>
-    <string name="date_time_set_date">"Установка даты"</string>
-    <string name="date_time_date_format">"Выбор формата даты"</string>
-    <string name="zone_list_menu_sort_alphabetically">"Расположить в алфавитном порядке"</string>
-    <string name="zone_list_menu_sort_by_timezone">"Сортировать по часовому поясу"</string>
-    <string name="security_settings_title">"Безопасность и местоположение"</string>
-    <string name="security_settings_summary">"Задать местоположение, разблокировку экрана, блокировку SIM-карты"</string>
+    <string name="date_time_set_date">"Настроить дату"</string>
+    <string name="date_time_date_format">"Выбрать формат даты"</string>
+    <string name="zone_list_menu_sort_alphabetically">"Упорядочить по алфавиту"</string>
+    <string name="zone_list_menu_sort_by_timezone">"Упорядочить по часовому поясу"</string>
+    <string name="security_settings_title">"Безопасность и место"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"Пароли"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Включить Bluetooth"</string>
     <string name="bluetooth_settings">"Настройки Bluetooth"</string>
     <string name="bluetooth_settings_title">"Настройки Bluetooth"</string>
-    <string name="bluetooth_settings_summary">"Управление подключениями, установка названия и видимости устройства"</string>
-    <string name="bluetooth_pin_entry">"Запрос на соединение Bluetooth"</string>
+    <string name="bluetooth_settings_summary">"Настройка подключений, видимости и имени устройства"</string>
+    <string name="bluetooth_pin_entry">"Запрос сопряжения Bluetooth"</string>
     <string name="bluetooth_device_info">"Сведения об устройстве Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Для создания пары укажите PIN."\n"(Попробуйте 0000 или 1234.)"</string>
+    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Введите PIN-код для сопряжения."\n"(Попробуйте 0000 или 1234.)"</string>
     <string name="bluetooth_error_title">"Внимание"</string>
-    <string name="bluetooth_pairing_error_message">"Не удалось создать пару с устройством <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message">"Не удалось создать пару с устройством <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, поскольку указан неверный PIN."</string>
-    <string name="bluetooth_connecting_error_message">"Не удалось подключиться к устройству <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_error_message">"Неполадка при сопряжении с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message">"Неполадка при сопряжении с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Введен неверный PIN."</string>
+    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
+    <skip />
+    <string name="bluetooth_connecting_error_message">"Возникла неполадка при подключении к <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title">"Поиск устройств"</string>
-    <string name="bluetooth_device_context_connect">"Подключиться"</string>
+    <string name="bluetooth_device_context_connect">"Подключить"</string>
     <string name="bluetooth_device_context_disconnect">"Отключить"</string>
-    <string name="bluetooth_device_context_pair_connect">"Создать пару и подключиться"</string>
-    <string name="bluetooth_device_context_unpair">"Отсоединить"</string>
-    <string name="bluetooth_device_context_disconnect_unpair">"Отключиться и разорвать пару"</string>
-    <string name="bluetooth_device_context_connect_advanced">"Параметры…"</string>
-    <string name="bluetooth_connect_specific_profiles_title">"Подключиться к…"</string>
+    <string name="bluetooth_device_context_pair_connect">"Выполнить сопряжение и подключить"</string>
+    <string name="bluetooth_device_context_unpair">"Отменить сопряжение"</string>
+    <string name="bluetooth_device_context_disconnect_unpair">"Отключить и отменить сопряжение"</string>
+    <string name="bluetooth_device_context_connect_advanced">"Параметры..."</string>
+    <string name="bluetooth_connect_specific_profiles_title">"Подключить к..."</string>
     <string name="bluetooth_profile_a2dp">"Мультимедиа"</string>
     <string name="bluetooth_profile_headset">"Телефон"</string>
-    <string name="bluetooth_summary_connected_to_a2dp">"Подключено к мультимедийному звуковому выходу"</string>
-    <string name="bluetooth_summary_connected_to_headset">"Подключено к звуковому выходу телефона"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset">"Подключено к звуковому выходу телефона и мультимедиа"</string>
-    <string name="bluetooth_device_advanced_title">"Параметры <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_device_advanced_online_mode_title">"Подключиться"</string>
+    <string name="bluetooth_summary_connected_to_a2dp">"Подключено к мультимедийному аудиоустройству"</string>
+    <string name="bluetooth_summary_connected_to_headset">"Подключено к аудиоустройству телефона"</string>
+    <string name="bluetooth_summary_connected_to_a2dp_headset">"Подключено к телефону и мультимедийному аудиоустройству"</string>
+    <string name="bluetooth_device_advanced_title">"параметры <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_device_advanced_online_mode_title">"Подключить"</string>
     <string name="bluetooth_device_advanced_online_mode_summary">"Подключиться к устройству Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title">"Профили"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected">"Подключено к мультимедийному звуковому выходу"</string>
-    <string name="bluetooth_headset_profile_summary_connected">"Подключено к звуковому выходу телефона"</string>
-    <string name="bluetooth_a2dp_profile_summary_use_for">"Использовать для звука мультимедиа"</string>
-    <string name="bluetooth_headset_profile_summary_use_for">"Использовать для звука телефона"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected">"Подключено к мультимедийному аудиоустройству"</string>
+    <string name="bluetooth_headset_profile_summary_connected">"Подключено к аудиоустройству телефона"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for">"Использовать для мультимедийного аудиоустройства"</string>
+    <string name="bluetooth_headset_profile_summary_use_for">"Использовать для аудиоустройства телефона"</string>
     <string name="wifi">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_title">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary">"Включить Wi-Fi"</string>
     <string name="wifi_settings">"Настройки Wi-Fi"</string>
     <string name="wifi_settings_category">"Настройки Wi-Fi"</string>
-    <string name="wifi_settings_summary">"Настройка и управление точками доступа беспроводной связи"</string>
-    <string name="forget_network">"Удалить навсегда"</string>
+    <string name="wifi_settings_summary">"Настройка и управление точками доступа беспроводной сети"</string>
+    <string name="forget_network">"Стереть"</string>
     <string name="wifi_status">"Состояние"</string>
     <string name="wifi_link_speed">"Скорость"</string>
-    <string name="wifi_signal_3">"Отличный"</string>
-    <string name="wifi_signal_2">"Хороший"</string>
-    <string name="wifi_signal_1">"Средний"</string>
-    <string name="wifi_signal_0">"Плохой"</string>
+    <string name="wifi_signal_3">"Отлично"</string>
+    <string name="wifi_signal_2">"Хорошо"</string>
+    <string name="wifi_signal_1">"Высокий"</string>
+    <string name="wifi_signal_0">"Низкий"</string>
     <string name="security">"Безопасность"</string>
-    <string name="wifi_security_open">"Без шифрования"</string>
+    <string name="wifi_security_open">"Открыть"</string>
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
+    <skip />
+    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
+    <skip />
     <string name="wifi_security_unknown">"Неизвестно"</string>
-    <string name="wifi_security_verbose_open">"Открытая сеть"</string>
-    <string name="wifi_security_verbose_wep">"Защищена WEP"</string>
-    <string name="wifi_security_verbose_wpa">"Защищена WPA"</string>
-    <string name="wifi_security_verbose_wpa2">"Защищена WPA2"</string>
+    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
+    <skip />
     <string name="ip_address">"IP-адрес"</string>
-    <string name="signal">"Уровень сигнала"</string>
-    <string name="wifi_starting">"Включение…"</string>
-    <string name="wifi_stopping">"Выключение…"</string>
+    <string name="signal">"Громкость сигнала"</string>
+    <string name="wifi_starting">"Включение..."</string>
+    <string name="wifi_stopping">"Выключение..."</string>
     <string name="wifi_error">"Ошибка"</string>
-    <string name="error_starting">"Не удается запустить Wi-Fi"</string>
-    <string name="error_stopping">"Не удается остановить Wi-Fi"</string>
-    <string name="error_scanning">"Не удается начать поиск сетей"</string>
-    <string name="error_connecting">"Не удается подключиться к сети"</string>
-    <string name="error_saving">"Не удается сохранить сеть"</string>
-    <string name="connect">"Подключиться"</string>
-    <string name="connect_to_blank">"Подключиться к сети <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
-    <string name="please_type_passphrase">"Пароль беспроводной сети"</string>
+    <string name="error_starting">"Не удалось запустить Wi-Fi"</string>
+    <string name="error_stopping">"Не удалось остановить Wi-Fi"</string>
+    <string name="error_scanning">"Не удалось выполнить поиск сети"</string>
+    <string name="error_connecting">"Не удалось подключиться к сети"</string>
+    <string name="error_saving">"Не удалось сохранить сеть"</string>
+    <string name="connect">"Подключить"</string>
+    <string name="connect_to_blank">"Подключить к <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for please_select_eap (4488240331626456338) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for please_type_identity (7061261155499513089) -->
+    <skip />
+    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
+    <skip />
+    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
+    <skip />
+    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
+    <skip />
+    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
+    <skip />
+    <string name="please_type_passphrase">"Пароль для беспроводного подключения"</string>
     <string name="please_type_hex_key">"Шестнадцатеричный ключ WEP (0-9, A-F)"</string>
     <string name="wifi_show_password">"Показать пароль."</string>
-    <string name="scan_wifi">"Сканировать"</string>
-    <string name="summary_not_in_range">"Вне зоны действия"</string>
-    <string name="summary_remembered">"Запомнено ранее"</string>
-    <string name="summary_connection_failed">"Соединение не установлено, повторите попытку"</string>
+    <string name="scan_wifi">"Поиск"</string>
+    <string name="summary_not_in_range">"Вне диапазона"</string>
+    <!-- no translation found for summary_remembered (6079941090549401742) -->
+    <skip />
+    <string name="summary_connection_failed">"Не удалось установить соединение. Выберите, чтобы повторить попытку"</string>
     <string name="wifi_access_points">"Сети Wi-Fi"</string>
-    <string name="wifi_type_ssid">"SSID сети"</string>
+    <string name="wifi_type_ssid">"Сетевой SSID"</string>
     <string name="wifi_security">"Безопасность"</string>
     <string name="wifi_save_config">"Сохранить"</string>
-    <string name="wifi_password_unchanged">"(не изменено)"</string>
+    <string name="wifi_password_unchanged">"(не изменялось)"</string>
     <string name="wifi_add_other_network">"Добавить сеть Wi-Fi"</string>
-    <string name="wifi_notify_open_networks">"Уведомление о сети"</string>
-    <string name="wifi_notify_open_networks_summary">"Уведомить меня при наличии открытой сети"</string>
-    <string name="wifi_password_incorrect_error">"Указан неверный пароль сети. Повторите попытку."</string>
-    <string name="wifi_generic_connection_error">"Проблема при подключении к сети. Повторите попытку."</string>
-    <string name="wifi_menu_advanced">"Дополнительно"</string>
+    <string name="wifi_notify_open_networks">"Сетевое уведомление"</string>
+    <string name="wifi_notify_open_networks_summary">"Уведомить о доступности открытой сети"</string>
+    <string name="wifi_password_incorrect_error">"Введен неверный сетевой пароль. Повторите попытку."</string>
+    <string name="wifi_generic_connection_error">"При подключении к сети возникла неполадка. Повторите попытку."</string>
+    <string name="wifi_menu_advanced">"Дополнительные функции"</string>
     <string name="wifi_ip_settings_titlebar">"Настройки IP"</string>
     <string name="wifi_ip_settings_menu_save">"Сохранить"</string>
     <string name="wifi_ip_settings_menu_cancel">"Отмена"</string>
-    <string name="wifi_ip_settings_invalid_ip">"Укажите действительный IP-адрес."</string>
-    <string name="wifi_use_static_ip">"Использовать статический IP"</string>
+    <string name="wifi_ip_settings_invalid_ip">"Введите действительный IP-адрес."</string>
+    <string name="wifi_use_static_ip">"Использовать статический IP-адрес"</string>
     <string name="wifi_ip_address">"IP-адрес"</string>
     <string name="wifi_dns1">"DNS 1"</string>
     <string name="wifi_dns2">"DNS 2"</string>
     <string name="wifi_gateway">"Шлюз"</string>
     <string name="wifi_netmask">"Маска сети"</string>
-    <string name="wifi_context_menu_connect">"Подключиться к сети"</string>
-    <string name="wifi_context_menu_forget">"Удалить сеть"</string>
+    <string name="wifi_context_menu_connect">"Подключить к сети"</string>
+    <string name="wifi_context_menu_forget">"Забыли сеть"</string>
     <string name="wifi_context_menu_change_password">"Изменить пароль"</string>
-    <string name="wifi_advanced_titlebar">"Дополнительно"</string>
+    <string name="wifi_advanced_titlebar">"Дополнительные функции"</string>
     <string name="wifi_setting_num_channels_title">"Управляющий домен"</string>
-    <string name="wifi_setting_num_channels_summary">"Установить количество используемых каналов"</string>
-    <string name="wifi_setting_num_channels_error">"При установке управляющего домена возникла проблема."</string>
-    <string name="wifi_setting_num_channels_channel_phrase">"Каналов: <xliff:g id="NUM_CHANNELS">%1$d</xliff:g>"</string>
+    <string name="wifi_setting_num_channels_summary">"Настроить количество используемых каналов"</string>
+    <string name="wifi_setting_num_channels_error">"При установке управляющего домена возникла неполадка."</string>
+    <string name="wifi_setting_num_channels_channel_phrase">"каналов: <xliff:g id="NUM_CHANNELS">%1$d</xliff:g>"</string>
     <string name="wifi_setting_sleep_policy_title">"Правила перехода Wi-Fi в спящий режим"</string>
     <string name="wifi_setting_sleep_policy_summary">"Укажите, когда следует переходить от Wi-Fi к мобильным данным"</string>
-    <string name="wifi_setting_sleep_policy_error">"При установке правила перехода в спящий режим возникла проблема."</string>
+    <string name="wifi_setting_sleep_policy_error">"При установке правила перехода в спящий режим возникла неполадка."</string>
     <string name="wifi_advanced_mac_address_title">"MAC-адрес"</string>
-    <string name="fragment_status_scanning">"Идет сканирование…"</string>
-    <string name="fragment_status_connecting">"Идет подключение к <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
-    <string name="fragment_status_authenticating">"Аутентификация в сети <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
-    <string name="fragment_status_obtaining_ip">"Получение IP-адреса в <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_scanning">"Поиск..."</string>
+    <string name="fragment_status_connecting">"Соединение с сетью <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_authenticating">"Аутентификация в сети <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
+    <string name="fragment_status_obtaining_ip">"Получение IP-адреса от <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
     <string name="fragment_status_connected">"Подключено к <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
-    <string name="fragment_status_disconnecting">"Отключение от сети <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_disconnecting">"Отключение от <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
     <string name="fragment_status_disconnected">"Отключено"</string>
-    <string name="fragment_status_failed">"Ошибка"</string>
-    <string name="status_scanning">"Идет сканирование…"</string>
-    <string name="status_connecting">"Идет подключение…"</string>
-    <string name="status_authenticating">"Идет аутентификация…"</string>
-    <string name="status_obtaining_ip">"Получение адреса…"</string>
+    <string name="fragment_status_failed">"Сбой"</string>
+    <string name="status_scanning">"Поиск..."</string>
+    <string name="status_connecting">"Подключение..."</string>
+    <string name="status_authenticating">"Аутентификация..."</string>
+    <string name="status_obtaining_ip">"Получение адреса..."</string>
     <string name="status_connected">"Подключено"</string>
-    <string name="status_disconnecting">"Отключение…"</string>
+    <string name="status_disconnecting">"Отключение..."</string>
     <string name="status_disconnected">"Отключено"</string>
-    <string name="status_failed">"Ошибка"</string>
-    <string name="sound_and_display_settings">"Звук и экран"</string>
+    <string name="status_failed">"Сбой"</string>
+    <string name="sound_and_display_settings">"Звук и изображение"</string>
     <string name="sound_settings">"Настройки звука"</string>
-    <string name="sound_and_display_settings_summary">"Установка мелодий звонка, уведомлений, яркости экрана"</string>
+    <string name="sound_and_display_settings_summary">"Настроить мелодии, уведомления, яркость экрана"</string>
     <string name="silent_mode_title">"Беззвучный режим"</string>
-    <string name="silent_mode_summary">"Отключение всех звуков, кроме мультимедиа и будильников"</string>
+    <string name="silent_mode_summary">"Все звуки, кроме мультимедиа и сигналов, отключены"</string>
     <string name="silent_mode_incl_alarm_summary">"Все звуки, кроме аудио и видео, отключены"</string>
-    <string name="ringtone_title">"Мелодия звонка телефона"</string>
-    <string name="ringtone_summary">"Установить мелодию звонка для входящих вызовов по умолчанию"</string>
+    <string name="ringtone_title">"Мелодия телефона"</string>
+    <string name="ringtone_summary">"Настроить мелодию по умолчанию для входящего вызова"</string>
     <string name="ring_volume_title">"Громкость звонка"</string>
-    <string name="ring_volume_summary">"Установить громкость входящих звонков и уведомлений"</string>
-    <string name="vibrate_title">"Виброзвонок"</string>
-    <string name="vibrate_summary">"Вибрация при входящих вызовах"</string>
+    <string name="ring_volume_summary">"Настроить громкость входящих вызовов и уведомлений"</string>
+    <string name="vibrate_title">"Вибрация телефона"</string>
+    <string name="vibrate_summary">"Включать вибрацию телефона при входящих вызовах"</string>
     <string name="notification_sound_title">"Мелодия уведомления"</string>
-    <string name="notification_sound_summary">"Задать мелодию уведомления по умолчанию"</string>
-    <string name="incoming_call_volume_title">"Громкость входящих вызовов"</string>
+    <string name="notification_sound_summary">"Настроить мелодию уведомления по умолчанию"</string>
+    <string name="incoming_call_volume_title">"Громкость входящего вызова"</string>
     <string name="notification_volume_title">"Громкость уведомления"</string>
-    <string name="checkbox_notification_same_as_incoming_call">"Использовать громкость входящих вызовов для уведомлений"</string>
-    <string name="notification_sound_dialog_title">"Выбрать мелодию уведомления"</string>
-    <string name="media_volume_title">"Громкость звука мультимедиа"</string>
-    <string name="media_volume_summary">"Установить громкость музыки и видео"</string>
-    <string name="dtmf_tone_enable_title">"Звук при нажатии"</string>
-    <string name="dtmf_tone_enable_summary_on">"Издавать сигналы при использовании клавиатуры"</string>
-    <string name="dtmf_tone_enable_summary_off">"Издавать сигналы при использовании клавиатуры"</string>
-    <string name="sound_effects_enable_title">"Звук при выборе"</string>
-    <string name="sound_effects_enable_summary_on">"Воспроизвести звук при выборе на экране"</string>
-    <string name="sound_effects_enable_summary_off">"Воспроизвести звук при выборе на экране"</string>
-    <string name="play_media_notification_sounds_enable_title">"Оповещения карты SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"Отключить звуковые сигналы для карты SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"Включить предупреждающие звуки карты SD"</string>
+    <string name="checkbox_notification_same_as_incoming_call">"Использовать громкость входящего звонка для уведомлений"</string>
+    <string name="notification_sound_dialog_title">"Выбрать мелодию уведомлений"</string>
+    <string name="media_volume_title">"Громкость мультимедиа"</string>
+    <string name="media_volume_summary">"Настроить громкость музыки и видео"</string>
+    <string name="dtmf_tone_enable_title">"Тональные сигналы нажатия"</string>
+    <string name="dtmf_tone_enable_summary_on">"Воспроизводить тональные сигналы клавиатуры"</string>
+    <string name="dtmf_tone_enable_summary_off">"Воспроизводить тональные сигналы клавиатуры"</string>
+    <string name="sound_effects_enable_title">"Звук при нажатии"</string>
+    <string name="sound_effects_enable_summary_on">"Воспроизводить тональный сигнал при выборе экрана"</string>
+    <string name="sound_effects_enable_summary_off">"Воспроизводить звук при нажатии на экран"</string>
+    <string name="play_media_notification_sounds_enable_title">"Уведомления карты SD"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
+    <skip />
     <string name="sync_settings">"Синхронизация данных"</string>
-    <string name="sync_settings_summary">"Выбрать синхронизируемые приложения"</string>
+    <string name="sync_settings_summary">"Выбрать приложения для синхронизации"</string>
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"Настройки экрана"</string>
     <string name="animations_title">"Анимация"</string>
     <string name="animations_summary_on">"Показывать анимацию при открытии и закрытии окон"</string>
@@ -373,70 +436,78 @@
     <string name="accelerometer_summary_off">"Автоматически менять ориентацию при повороте телефона"</string>
     <string name="brightness">"Яркость"</string>
     <string name="brightness_summary">"Настроить яркость экрана"</string>
-    <string name="screen_timeout">"Время до отключения экрана"</string>
-    <string name="screen_timeout_summary">"Настроить задержку автоматического отключения экрана"</string>
+    <string name="screen_timeout">"Время отключения экрана"</string>
+    <string name="screen_timeout_summary">"Выбрать интервал до автоматического отключения экрана"</string>
     <string name="sim_lock_settings">"Настройки блокировки SIM-карты"</string>
-    <string name="sim_lock_settings_category">"Установить блокировку SIM-карты"</string>
+    <string name="sim_lock_settings_category">"Настроить блокировку SIM-карты"</string>
     <string name="sim_lock_settings_title">"Блокировка SIM-карты"</string>
-    <string name="sim_pin_toggle">"Блокировка SIM-карты"</string>
-    <string name="sim_lock_on">"Для использования телефона требуется PIN"</string>
-    <string name="sim_lock_off">"Для использования телефона требуется PIN"</string>
-    <string name="sim_pin_change">"Изменение PIN SIM-карты"</string>
-    <string name="sim_enter_pin">"PIN SIM-карты"</string>
-    <string name="sim_enable_sim_lock">"Блокировка SIM-карты"</string>
+    <string name="sim_pin_toggle">"Заблокировать SIM-карту"</string>
+    <string name="sim_lock_on">"Для использования телефона необходим PIN-код"</string>
+    <string name="sim_lock_off">"Для использования телефона необходим PIN-код"</string>
+    <string name="sim_pin_change">"Изменить PIN-код SIM-карты"</string>
+    <string name="sim_enter_pin">"PIN-код SIM-карты"</string>
+    <string name="sim_enable_sim_lock">"Заблокировать SIM-карту"</string>
     <string name="sim_disable_sim_lock">"Разблокировать SIM-карту"</string>
-    <string name="sim_enter_old">"Старый PIN SIM-карты"</string>
+    <string name="sim_enter_old">"Старый PIN-код SIM-карты"</string>
     <string name="sim_enter_new">"Новый PIN SIM-карты"</string>
-    <string name="sim_reenter_new">"Введите новый PIN еще раз"</string>
-    <string name="sim_change_pin">"PIN SIM-карты"</string>
+    <string name="sim_reenter_new">"Введите новый PIN повторно"</string>
+    <string name="sim_change_pin">"PIN-код SIM-карты"</string>
     <string name="sim_bad_pin">"Неверный PIN!"</string>
     <string name="sim_pins_dont_match">"PIN-коды не совпадают!"</string>
-    <string name="sim_change_failed">"Не удается изменить PIN."\n"Возможно, указан неверный PIN."</string>
-    <string name="sim_change_succeeded">"PIN SIM-карты успешно изменен"</string>
-    <string name="sim_lock_failed">"Не удается изменить состояние блокировки SIM-карты."\n"Возможно, указан неверный PIN."</string>
+    <string name="sim_change_failed">"Не удалось изменить PIN."\n"Возможно, введен неверный PIN."</string>
+    <string name="sim_change_succeeded">"PIN-код SIM-карты успешно изменен"</string>
+    <string name="sim_lock_failed">"Не удалось изменить состояние блокировки SIM-карты."\n"Возможно, введен неверный PIN."</string>
     <string name="sim_enter_ok">"ОК"</string>
     <string name="sim_enter_cancel">"Отмена"</string>
     <string name="device_info_settings">"Состояние телефона"</string>
-    <string name="system_update_settings_list_item_title">"Системные обновления"</string>
-    <string name="system_update_settings_list_item_summary">"Проверить наличие системных обновлений"</string>
-    <string name="firmware_version">"Версия микропрограммного обеспечения"</string>
+    <string name="system_update_settings_list_item_title">"Обновления системы"</string>
+    <string name="system_update_settings_list_item_summary">"Проверить наличие обновлений системы"</string>
+    <string name="firmware_version">"Версия микропрограммы"</string>
     <string name="model_number">"Номер модели"</string>
-    <string name="baseband_version">"Версия основного диапазона"</string>
-    <string name="kernel_version">"Версия Kernel"</string>
+    <string name="baseband_version">"Версия канала связи"</string>
+    <string name="kernel_version">"Версия ядра"</string>
     <string name="build_number">"Номер сборки"</string>
     <string name="device_info_not_available">"Недоступно"</string>
     <string name="device_status_activity_title">"Состояние"</string>
     <string name="device_status">"Состояние"</string>
-    <string name="device_status_summary">"IMEI, номер телефона, сигнал и т.д."</string>
-    <string name="storage_settings_title">"Карта SD и память телефона"</string>
-    <string name="storage_settings_summary">"Отключить карту SD, просмотреть объем свободного места"</string>
-    <string name="status_number">"Номер телефона"</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
+    <string name="storage_settings_title">"SD-карта и память телефона"</string>
+    <string name="storage_settings_summary">"Демонтировать SD-карту, показать доступную память"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"Тип мобильной сети"</string>
     <string name="status_data_state">"Состояние мобильной сети"</string>
-    <string name="status_service_state">"Наличие обслуживания"</string>
-    <string name="status_signal_strength">"Уровень сигнала"</string>
+    <string name="status_service_state">"Состояние службы"</string>
+    <string name="status_signal_strength">"Громкость сигнала"</string>
     <string name="status_roaming">"Роуминг"</string>
     <string name="status_operator">"Сеть"</string>
     <string name="status_wifi_mac_address">"MAC-адрес Wi-Fi"</string>
     <string name="status_bt_address">"Адрес Bluetooth"</string>
     <string name="status_unavailable">"Недоступно"</string>
-    <string name="status_up_time">"Время работы"</string>
-    <string name="status_awake_time">"Время активности"</string>
-    <string name="internal_memory">"Хранение в памяти телефона"</string>
-    <string name="sd_memory">"Карта SD"</string>
-    <string name="memory_available">"Доступное место"</string>
+    <string name="status_up_time">"Время с момента загрузки"</string>
+    <string name="status_awake_time">"Время работы"</string>
+    <string name="internal_memory">"Внутренняя память телефона"</string>
+    <string name="sd_memory">"SD-карта"</string>
+    <string name="memory_available">"Свободное место"</string>
     <string name="memory_size">"Всего места"</string>
     <string name="sd_eject">"Демонтировать карту SD"</string>
     <string name="sd_eject_summary">"Демонтировать карту SD для безопасного удаления"</string>
     <string name="sd_format">"Форматировать карту SD"</string>
     <string name="sd_format_summary">"Форматировать (очистить) карту SD"</string>
     <string name="sd_unavailable">"Недоступно"</string>
-    <string name="read_only">" (Только для чтения)"</string>
+    <string name="read_only">" (только для чтения)"</string>
     <string name="battery_status_title">"Состояние батареи"</string>
-    <string name="battery_level_title">"Уровень батареи"</string>
-    <string name="apn_settings">"APN"</string>
-    <string name="apn_edit">"Изменение точки доступа"</string>
-    <string name="apn_not_set">"&lt;Не задано&gt;"</string>
+    <string name="battery_level_title">"Уровень заряда батареи"</string>
+    <string name="apn_settings">"Номера APN"</string>
+    <string name="apn_edit">"Изменить точку доступа"</string>
+    <string name="apn_not_set">"&lt;Не настроено&gt;"</string>
     <string name="apn_name">"Имя"</string>
     <string name="apn_apn">"APN"</string>
     <string name="apn_http_proxy">"Прокси"</string>
@@ -445,105 +516,117 @@
     <string name="apn_password">"Пароль"</string>
     <string name="apn_server">"Сервер"</string>
     <string name="apn_mmsc">"MMSC"</string>
-    <string name="apn_mms_proxy">"Прокси MMS"</string>
+    <string name="apn_mms_proxy">"Прокси-сервер MMS"</string>
     <string name="apn_mms_port">"Порт MMS"</string>
     <string name="apn_mcc">"MCC"</string>
     <string name="apn_mnc">"MNC"</string>
     <string name="apn_type">"Тип APN"</string>
     <string name="menu_delete">"Удалить APN"</string>
-    <string name="menu_new">"Создать APN"</string>
+    <string name="menu_new">"Новая точка доступа"</string>
     <string name="menu_save">"Сохранить"</string>
-    <string name="menu_cancel">"Закрыть"</string>
+    <string name="menu_cancel">"Отменить"</string>
     <string name="error_title">"Внимание"</string>
-    <string name="error_name_empty">"Поле Имя не может быть пустым."</string>
-    <string name="error_apn_empty">"APN не может быть пустым."</string>
+    <string name="error_name_empty">"Поле \"Имя\" не может быть пустым."</string>
+    <string name="error_apn_empty">"Поле APN не может быть пустым."</string>
     <string name="error_mcc_not3">"Поле MCC должно содержать 3 цифры."</string>
     <string name="error_mnc_not23">"Поле MNC должно содержать 2 или 3 цифры."</string>
     <string name="restore_default_apn">"Восстановление настроек APN по умолчанию"</string>
     <string name="menu_restore">"Восстановить настройки по умолчанию"</string>
     <string name="restore_default_apn_completed">"Восстановление настроек APN по умолчанию завершено"</string>
-    <string name="master_clear_title">"Сброс заводских данных"</string>
-    <string name="master_clear_summary">"Удаление всех данных с телефона"</string>
-    <string name="master_clear_desc">"Это действие сбросит телефон до исходного заводского состояния, удалив все данные и загруженные приложения!"</string>
-    <string name="master_clear_button_text">"Сбросить телефон"</string>
-    <string name="master_clear_final_desc">"Сбросить телефон? Все данные и приложения будут удалены; действия необратимы!"</string>
-    <string name="master_clear_final_button_text">"Удалить все"</string>
-    <string name="master_clear_gesture_prompt">"Воспроизведите комбинацию разблокировки"</string>
-    <string name="master_clear_gesture_explanation">"Для подтверждения сброса телефона нужно воспроизвести комбинацию разблокировки."</string>
-    <string name="master_clear_failed">"Сброс не произведен, так как служба очистки системы недоступна."</string>
+    <string name="master_clear_title">"Возврат к исходным настройкам"</string>
+    <string name="master_clear_summary">"Удаляет всю информацию в памяти телефона"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
+    <string name="master_clear_button_text">"Сбросить настройки телефона"</string>
+    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
+    <skip />
+    <string name="master_clear_final_button_text">"Стереть все"</string>
+    <string name="master_clear_gesture_prompt">"Начертить графический ключ"</string>
+    <string name="master_clear_gesture_explanation">"Для подтверждения сброса настроек телефона необходимо начертить графический ключ."</string>
+    <string name="master_clear_failed">"Не удалось выполнить сброс, поскольку служба System Clear недоступна."</string>
     <string name="media_format_title">"Форматировать карту SD."</string>
     <string name="media_format_summary">"Удаляет все данные с карты SD"</string>
     <string name="media_format_desc">"Это действие приведет к очистке карты SD в телефоне. ВСЯ информация, находящаяся на карте, будет удалена!"</string>
     <string name="media_format_button_text">"Форматировать карту SD"</string>
     <string name="media_format_final_desc">"Форматировать карту SD с удалением всех ваших данных? Это действие нельзя отменить!"</string>
     <string name="media_format_final_button_text">"Стереть все"</string>
-    <string name="media_format_gesture_prompt">"Воспроизвести шаблон снятия блока"</string>
-    <string name="media_format_gesture_explanation">"Для подтверждения форматирования карты SD нужно воспроизвести шаблон снятия блока."</string>
+    <string name="media_format_gesture_prompt">"Начертить графический ключ разблокировки"</string>
+    <string name="media_format_gesture_explanation">"Для подтверждения форматирования карты SD нужно начертить графический ключ разблокировки."</string>
     <string name="call_settings_title">"Настройки вызовов"</string>
-    <string name="call_settings_summary">"Настройка голосовой почты, перенаправления звонков, удержания звонков, идентификатора звонящего"</string>
-    <string name="network_settings_title">"Мобильные сети"</string>
-    <string name="network_settings_summary">"Установить параметры роуминга, сетей, APN"</string>
-    <string name="location_title">"Источники моего местоположения"</string>
-    <string name="location_network_based">"Использовать беспроводные сети"</string>
-    <string name="location_networks_disabled">"Просмотр местоположения в приложениях (например в Картах) с помощью беспроводных сетей"</string>
-    <string name="location_neighborhood_level">"Местоположение определяется с помощью Wi-Fi и/или сотовых сетей"</string>
-    <string name="location_gps">"Включить спутники GPS"</string>
-    <string name="location_street_level">"Определение местоположения с точностью до улицы (для экономии заряда батареи отмените выбор)"</string>
-    <string name="location_gps_disabled">"Находить меня до уровня улицы (требуется больше заряда батареи, а также прямая видимость неба)"</string>
+    <string name="call_settings_summary">"Настроить голосовую почту, АОН, переадресацию, параллельный вызов"</string>
+    <string name="network_settings_title">"Мобильная сеть"</string>
+    <string name="network_settings_summary">"Настроить параметры роуминга, сетей, APN"</string>
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
+    <string name="location_network_based">"Беспроводные сети"</string>
+    <string name="location_networks_disabled">"Просматривайте местоположение в приложениях (например, в Картах), используя беспроводную сеть"</string>
+    <string name="location_neighborhood_level">"Местоположение определяется сотовой сетью и/или Wi-Fi"</string>
+    <string name="location_gps">"Спутники GPS"</string>
+    <string name="location_street_level">"При определении местоположения с точностью до улицы (отмените выделения для экономии энергии батареи)"</string>
+    <string name="location_gps_disabled">"Точное позиционирование (требуется открытое небо и больше энергии)"</string>
+    <!-- no translation found for use_location_title (7585990952633568732) -->
+    <skip />
+    <!-- no translation found for use_location_summary (4411467143899877395) -->
+    <skip />
+    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
+    <skip />
+    <string name="agree">"Принимаю"</string>
+    <string name="disagree">"Не принимаю"</string>
     <string name="about_settings">"О телефоне"</string>
-    <string name="about_settings_summary">"Просмотреть юридические сведения, состояние телефона, версию ПО"</string>
-    <string name="legal_information">"Юридическая информация"</string>
-    <string name="contributors_title">"Авторы"</string>
+    <string name="about_settings_summary">"Посмотреть правовую информацию, состояние телефона, версию ПО"</string>
+    <string name="legal_information">"Правовая информация"</string>
+    <string name="contributors_title">"Участники"</string>
     <string name="copyright_title">"Авторские права"</string>
     <string name="license_title">"Лицензия"</string>
     <string name="terms_title">"Условия предоставления услуг"</string>
-    <string name="system_tutorial_list_item_title">"Руководство по работе с системой"</string>
+    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
+    <skip />
     <string name="system_tutorial_list_item_summary">"Узнайте, как пользоваться телефоном"</string>
-    <string name="settings_license_activity_title">"Лицензии Open Source"</string>
-    <string name="settings_license_activity_unavailable">"При загрузке лицензий произошла ошибка."</string>
+    <string name="settings_license_activity_title">"Лицензии ПО с открытым исходным кодом"</string>
+    <string name="settings_license_activity_unavailable">"При загрузке лицензий возникла неполадка."</string>
     <string name="settings_license_activity_loading">"Идет загрузка…"</string>
-    <string name="lock_settings_title">"Комбинация разблокировки экрана"</string>
-    <string name="lockpattern_change_lock_pattern_label">"Изменить последовательность разблокировки"</string>
-    <string name="lockpattern_need_to_unlock">"Подтвердите сохраненную комбинацию"</string>
-    <string name="lockpattern_need_to_unlock_wrong">"Неверно, попробуйте еще раз:"</string>
-    <string name="lockpattern_recording_intro_header">"Создайте комбинацию разблокировки"</string>
-    <string name="lockpattern_recording_intro_footer">"Для справки нажмите Menu"</string>
-    <string name="lockpattern_recording_inprogress">"По окончании уберите палец."</string>
-    <string name="lockpattern_recording_incorrect_too_short">"Соедините не менее <xliff:g id="NUMBER">%d</xliff:g> точек. Попробуйте еще раз:"</string>
-    <string name="lockpattern_pattern_entered_header">"Последовательность записана!"</string>
-    <string name="lockpattern_need_to_confirm">"Для подтверждения еще раз воспроизведите комбинацию:"</string>
-    <string name="lockpattern_pattern_confirmed_header">"Новая комбинация разблокировки:"</string>
-    <string name="lockpattern_confirm_button_text">"Подтверждение"</string>
-    <string name="lockpattern_restart_button_text">"Изменить"</string>
-    <string name="lockpattern_retry_button_text">"Повторить"</string>
+    <string name="lock_settings_title">"Графический ключ разблокировки экрана"</string>
+    <string name="lockpattern_change_lock_pattern_label">"Изменить графический ключ"</string>
+    <string name="lockpattern_need_to_unlock">"Подтвердить сохраненный графический ключ"</string>
+    <string name="lockpattern_need_to_unlock_wrong">"Повторите попытку:"</string>
+    <string name="lockpattern_recording_intro_header">"Начертить графический ключ разблокировки"</string>
+    <string name="lockpattern_recording_intro_footer">"Для справки нажмите \"Меню\"."</string>
+    <string name="lockpattern_recording_inprogress">"По завершении отпустите палец."</string>
+    <string name="lockpattern_recording_incorrect_too_short">"Соедините точки (как минимум <xliff:g id="NUMBER">%d</xliff:g>). Повторите попытку:"</string>
+    <string name="lockpattern_pattern_entered_header">"Графический ключ разблокировки записан!"</string>
+    <string name="lockpattern_need_to_confirm">"Для подтверждения начертите графический ключ повторно:"</string>
+    <string name="lockpattern_pattern_confirmed_header">"Новый графический ключ разблокировки:"</string>
+    <string name="lockpattern_confirm_button_text">"Подтвердите"</string>
+    <string name="lockpattern_restart_button_text">"Воспроизвести повторно"</string>
+    <string name="lockpattern_retry_button_text">"Повторить попытку"</string>
     <string name="lockpattern_continue_button_text">"Продолжить"</string>
-    <string name="lockpattern_settings_title">"Комбинация разблокировки"</string>
-    <string name="lockpattern_settings_enable_title">"Комбинация обязательна"</string>
-    <string name="lockpattern_settings_enable_summary">"Для разблокировки экрана воспроизведите комбинацию"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title">"Использовать видимую комбинацию"</string>
+    <string name="lockpattern_settings_title">"Графический ключ разблокировки"</string>
+    <string name="lockpattern_settings_enable_title">"Требовать графический ключ"</string>
+    <string name="lockpattern_settings_enable_summary">"Для разблокировки нужно начертить графический ключ"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">"Показывать графический ключ"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title">"Использовать тактильную обратную связь"</string>
-    <string name="lockpattern_settings_choose_lock_pattern">"Задать комбинацию разблокировки"</string>
-    <string name="lockpattern_settings_change_lock_pattern">"Изменить последовательность разблокировки"</string>
-    <string name="lockpattern_settings_help_how_to_record">"Как создать комбинацию разблокировки"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Слишком много неверных попыток!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Повторите попытку через <xliff:g id="NUMBER">%d</xliff:g> сек."</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"Установить графический ключ"</string>
+    <string name="lockpattern_settings_change_lock_pattern">"Изменить графический ключ разблокировки"</string>
+    <string name="lockpattern_settings_help_how_to_record">"Как начертить графический ключ разблокировки"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Слишком много неудачных попыток!"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Повторите попытку через <xliff:g id="NUMBER">%d</xliff:g> с."</string>
     <string name="skip_button_label">"Отмена"</string>
     <string name="next_button_label">"Далее"</string>
-    <string name="lock_title">"Защита телефона"</string>
-    <string name="lock_intro_message"><font size="17">"Защитите телефон от несанкционированного использования, создав личную комбинацию разблокировки экрана. "\n<font height="17">\n</font><b>"1"</b>"  На следующем экране показан пример создания комбинации "\n<font height="17">\n</font><b>"2"</b>"  Просмотрите его и создайте собственную комбинацию разблокировки. Пробуйте разные комбинации, но соединяйте не менее четырех точек. "\n<font height="17">\n</font><b>"3"</b>"  Воспроизведите комбинацию повторно для подтверждения. "\n<font height="17">\n</font><b>"Готовы начать? Нажмите \"Далее\""</b>". "\n<font height="3">\n</font>"Чтобы оставить телефон без защиты, нажмите \"Отмена\"."</font></string>
-    <string name="lock_example_title">"Пример комбинации"</string>
-    <string name="lock_example_message">"Соедините не меньше четырех точек."\n" "\n"Выберите \"Далее\", когда будете готовы создать свою комбинацию."</string>
-    <string name="manageapplications_settings_title">"Управление приложениями"</string>
+    <string name="lock_title">"Обеспечение безопасности телефона"</string>
+    <string name="lock_intro_message"><font size="17">"Защитите телефон от несанкционированного использования, создав собственный графический ключ разблокировки экрана. "\n<font height="17">\n</font><b>"1"</b>"  На следующем экране показан пример вычерчивания ключа. "\n<font height="17">\n</font><b>"3"</b>"  Подготовьтесь и создайте собственный графический ключ разблокировки. Можно экспериментировать с ключами, но в них должны быть соединены как минимум четыре точки. "\n<font height="17">\n</font><b>"3"</b>"  Для подтверждения начертите графический ключ повторно. "\n<font height="17">\n</font><b>" Готовы? Нажмите \"Далее\""</b>". "\n<font height="3">\n</font>"Если вы не хотите устанавливать защиту телефона, выберите \"Отмена\"."</font></string>
+    <string name="lock_example_title">"Пример графического ключа"</string>
+    <string name="lock_example_message">"Соедините как минимум четыре точки."\n" "\n"Выберите \"Далее\", когда будете готовы начертить собственный графический ключ разблокировки."</string>
+    <string name="manageapplications_settings_title">"Управлять приложениями"</string>
     <string name="manageapplications_settings_summary">"Управлять установленными приложениями и удалять их"</string>
     <string name="applications_settings">"Приложения"</string>
-    <string name="applications_settings_summary">"Управление приложениями, настройка горячих клавиш"</string>
-    <string name="applications_settings_header">"Настройки приложений"</string>
+    <string name="applications_settings_summary">"Управление приложениями, настройка клавиш быстрого запуска"</string>
+    <string name="applications_settings_header">"Настройки приложения"</string>
     <string name="install_applications">"Неизвестные источники"</string>
-    <string name="install_unknown_applications">"Разрешить установку приложений не из Android Маркет"</string>
-    <string name="install_all_warning">"Атака приложений из неизвестных источников более опасна для телефона и личных данных. Вы соглашаетесь, что несете всю ответственность за ущерб телефону или потерю данных, которые могут произойти от использования таких приложений."</string>
+    <string name="install_unknown_applications">"Разрешить установку приложений, полученных не из Маркета"</string>
+    <string name="install_all_warning">"Телефон и личные сведения более уязвимы к атакам приложений из неизвестных источников. Вы подтверждаете, что берете на себя всю ответственность в случае повреждения телефона и потери данных при использовании этих приложений."</string>
     <string name="application_info_label">"Сведения о приложении"</string>
-    <string name="storage_label">"Хранение"</string>
-    <string name="auto_launch_label">"Запускать по умолчанию"</string>
+    <string name="storage_label">"Память"</string>
+    <string name="auto_launch_label">"Запустить по умолчанию"</string>
     <string name="permissions_label">"Разрешения"</string>
     <string name="cache_header_label">"Кэш"</string>
     <string name="clear_cache_btn_text">"Очистить кэш"</string>
@@ -554,48 +637,60 @@
     <string name="application_size_label">"Приложение"</string>
     <string name="data_size_label">"Данные"</string>
     <string name="uninstall_text">"Удалить"</string>
-    <string name="clear_user_data_text">"Очистить данные"</string>
-    <string name="auto_launch_enable_text">"Это приложение по умолчанию запускается для некоторых действий."</string>
-    <string name="auto_launch_disable_text">"Значения по умолчанию не установлены."</string>
-    <string name="clear_activities">"Очистить значения по умолчанию"</string>
+    <string name="clear_user_data_text">"Стереть данные"</string>
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
+    <string name="auto_launch_enable_text">"Выбран запуск этого приложения по умолчанию при выполнении некоторых действий."</string>
+    <string name="auto_launch_disable_text">"Без настроек по умолчанию."</string>
+    <string name="clear_activities">"Удалить настройки по умолчанию"</string>
     <string name="unknown">"Неизвестно"</string>
-    <string name="sort_order_alpha">"Сортировать"</string>
-    <string name="sort_order_size">"Сортировать по размеру"</string>
-    <string name="manage_space_text">"Управление памятью"</string>
+    <string name="sort_order_alpha">"Упорядочить"</string>
+    <string name="sort_order_size">"Упорядочить по размеру"</string>
+    <string name="manage_space_text">"Управление местом"</string>
     <string name="filter">"Фильтр"</string>
     <string name="filter_dlg_title">"Выбрать параметры фильтра"</string>
     <string name="filter_apps_all">"Все"</string>
-    <string name="filter_apps_third_party">"Сторонние"</string>
-    <string name="filter_apps_running">"Выполняемые"</string>
+    <string name="filter_apps_third_party">"Независимые производители"</string>
+    <string name="filter_apps_running">"Режим работы"</string>
     <string name="loading">"Идет загрузка…"</string>
-    <string name="recompute_size">"Перерасчет размера…"</string>
+    <string name="recompute_size">"Повторное вычисление размера..."</string>
     <string name="clear_data_dlg_title">"Удалить"</string>
     <string name="clear_data_dlg_text">"Вся информация, сохраненная в этом приложении, будет удалена навсегда."</string>
     <string name="dlg_ok">"ОК"</string>
     <string name="dlg_cancel">"Отмена"</string>
     <string name="app_not_found_dlg_title">"Приложение не найдено"</string>
-    <string name="app_not_found_dlg_text">"Приложение не найдено в списке установленных приложений."</string>
-    <string name="clear_data_failed">"Не удается очистить данные приложения."</string>
-    <string name="security_settings_desc">"Это приложение имеет доступ к следующему на телефоне:"</string>
+    <string name="app_not_found_dlg_text">"Приложение не было найдено в списке установленных приложений."</string>
+    <string name="clear_data_failed">"Не удалось очистить данные приложения."</string>
+    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
+    <skip />
+    <string name="security_settings_desc">"Данное приложение обладает правами доступа к следующей информации на телефоне:"</string>
     <string name="computing_size">"Вычисление..."</string>
-    <string name="invalid_size_value">"Невозможно вычислить размер пакета"</string>
-    <string name="empty_list_msg">"У вас не установлено приложений сторонних разработчиков."</string>
-    <string name="language_settings">"Локаль и текст"</string>
-    <string name="language_settings_summary">"Выбор локали (языка и региона), параметров ввода текста и автоисправлений"</string>
-    <string name="language_category">"Настройки локали"</string>
+    <string name="invalid_size_value">"Не удалось вычислить размер пакета"</string>
+    <string name="empty_list_msg">"Не обнаружено установленных приложений от независимых поставщиков."</string>
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
+    <string name="language_settings">"Регион и ввод текста"</string>
+    <string name="language_settings_summary">"Выбрать язык и регион, способ ввода текста и параметры автокоррекции"</string>
+    <string name="language_category">"Региональные настройки"</string>
     <string name="text_category">"Настройки текста"</string>
-    <string name="phone_language">"Выбрать локаль"</string>
-    <string name="phone_language_summary">"Выбрать язык и страну"</string>
-    <string name="auto_replace">"Автозамена"</string>
-    <string name="auto_replace_summary">"Исправлять слова с опечатками"</string>
-    <string name="auto_caps">"Автоматически заменять заглавной буквой"</string>
-    <string name="auto_caps_summary">"Большие буквы в начале предложений"</string>
-    <string name="auto_punctuate">"Автоматическая пунктуация"</string>
+    <string name="phone_language">"Выбрать регион"</string>
+    <string name="phone_language_summary">"Выбор страны и языка"</string>
+    <string name="auto_replace">"Автокоррекция"</string>
+    <string name="auto_replace_summary">"Исправлять опечатки"</string>
+    <string name="auto_caps">"Заглавные автоматически"</string>
+    <string name="auto_caps_summary">"Писать предложения с заглавной буквы"</string>
+    <string name="auto_punctuate">"Автопунктуация"</string>
     <string name="hardkeyboard_category">"Настройки внешней клавиатуры"</string>
-    <string name="auto_punctuate_summary">"Чтобы вставить символ \".\", дважды нажмите пробел."</string>
-    <string name="show_password">"Показывать пароли"</string>
+    <string name="auto_punctuate_summary">"Для ввода точки можно дважды нажать клавишу \"Пробел\""</string>
+    <string name="show_password">"Видимые пароли"</string>
     <string name="show_password_summary">"Показывать пароль при вводе"</string>
-    <string name="ime_security_warning">"Возможно, при использовании этого метода будут собираться все вводимые данные, в том числе такие личные сведения, как пароли или номера кредитных карт. Метод обеспечивается программой <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Разрешить этот метод ввода?"</string>
+    <string name="ime_security_warning">"Возможно, при использовании этого метода будут собираться все вводимые данные, в том числе такие личные сведения, как пароли или номера кредитных карт. Метод обеспечивается приложением <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Разрешить этот метод ввода?"</string>
     <string name="user_dict_settings_titlebar">"Пользовательский словарь"</string>
     <string name="user_dict_settings_title">"Пользовательский словарь"</string>
     <string name="user_dict_settings_summary">"Добавить или удалить слова из пользовательского словаря"</string>
@@ -605,35 +700,39 @@
     <string name="user_dict_settings_context_menu_edit_title">"Изменить"</string>
     <string name="user_dict_settings_context_menu_delete_title">"Удалить"</string>
     <string name="user_dict_settings_empty_text">"В пользовательском словаре отсутствуют слова. Добавить слово можно с помощью меню."</string>
-    <string name="testing">"Тестирование"</string>
-    <string name="testing_phone_info">"Сведения о телефоне"</string>
-    <string name="testing_battery_info">"Сведения о батарее"</string>
+    <string name="testing">"Проверка"</string>
+    <string name="testing_phone_info">"Информация о телефоне"</string>
+    <string name="testing_battery_info">"Информация о батарее"</string>
     <string name="testing_battery_history">"Журнал сведений о батарее"</string>
     <string name="quick_launch_title">"Быстрый запуск"</string>
-    <string name="quick_launch_summary">"Задать горячие клавиши для запуска приложений"</string>
+    <string name="quick_launch_summary">"Настройка клавиш для быстрого запуска приложений"</string>
     <string name="quick_launch_assign_application">"Назначить приложение"</string>
     <string name="quick_launch_no_shortcut">"Нет ярлыка"</string>
     <string name="quick_launch_shortcut">"Поиск + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title">"Очистить"</string>
-    <string name="quick_launch_clear_dialog_message">"Ярлык <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (для приложения <xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) будет удален."</string>
+    <string name="quick_launch_clear_dialog_message">"Ярлык для <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) будет удален."</string>
     <string name="quick_launch_clear_ok_button">"ОК"</string>
     <string name="quick_launch_clear_cancel_button">"Отмена"</string>
     <string name="quick_launch_display_mode_applications">"Приложения"</string>
     <string name="quick_launch_display_mode_shortcuts">"Ярлыки"</string>
     <string name="input_methods_settings_title">"Ввод текста"</string>
-    <string name="input_methods_settings_summary">"Управление параметрами ввода текста"</string>
+    <string name="input_methods_settings_summary">"Задать параметры ввода текста"</string>
     <string name="input_methods_settings_label_format">"Настройки <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="onscreen_keyboard_settings_summary">"Настройки экранной клавиатуры"</string>
     <string name="builtin_keyboard_settings_title">"Клавиатура устройства"</string>
     <string name="builtin_keyboard_settings_summary">"Настройки встроенной клавиатуры"</string>
     <string name="development_settings_title">"Разработка"</string>
-    <string name="development_settings_summary">"Выбрать параметры разработки приложений"</string>
+    <string name="development_settings_summary">"Настроить параметры для разработки приложений"</string>
     <string name="enable_adb">"Отладка USB"</string>
-    <string name="enable_adb_summary">"Режим отладки при подключении USB"</string>
-    <string name="keep_screen_on">"Не выключать"</string>
-    <string name="keep_screen_on_summary">"При зарядке экран не отключается"</string>
-    <string name="allow_mock_location">"Разрешить фиктивные местоположения"</string>
-    <string name="allow_mock_location_summary">"Разрешить фиктивные местоположения"</string>
+    <string name="enable_adb_summary">"Режим отладки при подключенном USB-устройстве"</string>
+    <string name="keep_screen_on">"Оставить включенным"</string>
+    <string name="keep_screen_on_summary">"Во время зарядки экран будет всегда включен"</string>
+    <string name="allow_mock_location">"Разрешить копии мест"</string>
+    <string name="allow_mock_location_summary">"Разрешить копии местоположений"</string>
+    <!-- no translation found for adb_warning_title (1756027479229533250) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (5352555112049663033) -->
+    <skip />
     <string name="gadget_picker_title">"Выбор·гаджета"</string>
     <string name="widget_picker_title">"Выбор виджета"</string>
     <string name="battery_history_details_for">"Сведения для идентификатора пользователя %d"</string>
@@ -647,15 +746,19 @@
     <string name="battery_history_system_time">"Системное время:"</string>
     <string name="battery_history_total_time">"Общее время:"</string>
     <string name="battery_history_starts">"Запусков: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> дн., <xliff:g id="HOURS">%2$d</xliff:g> ч., <xliff:g id="MINUTES">%3$d</xliff:g> мин., <xliff:g id="SECONDS">%4$d</xliff:g> сек."</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> ч., <xliff:g id="MINUTES">%2$d</xliff:g> мин., <xliff:g id="SECONDS">%3$d</xliff:g>сек."</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> мин., <xliff:g id="SECONDS">%2$d</xliff:g> сек."</string>
-    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> секунд"</string>
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
     <string name="battery_history_packages_sharing_this_uid">"Пакеты с этим идентификатором пользователя:"</string>
     <string name="battery_history_no_data">"Данные об использовании батареи недоступны"</string>
     <string name="battery_history_sensor">"Сенсор:"</string>
     <string name="battery_history_wakelock">"Блокировка частичного включения:"</string>
-    <string name="battery_history_used_by_packages">"Использования сенсора пакетами:"</string>
+    <string name="battery_history_used_by_packages">"Сенсор использован пакетами:"</string>
     <string name="battery_history_sensor_usage">"Использовано пакетом <xliff:g id="PACKAGE">%2$s</xliff:g>: <xliff:g id="COUNT">%1$d</xliff:g> раз(а)"</string>
     <string name="battery_history_sensor_usage_multi">"Использовано <xliff:g id="COUNT">%1$d</xliff:g> раз(а) одним из:"</string>
     <string name="battery_history_awake_label">"Режим работы"</string>
@@ -672,4 +775,372 @@
     <string name="app_name_label">"Приложение"</string>
     <string name="launch_count_label">"Подсчет"</string>
     <string name="usage_time_label">"Время использования"</string>
+    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
+    <skip />
+    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
+    <skip />
+    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
+    <skip />
+    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (4630925382578609056) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
+    <skip />
+    <!-- no translation found for usage_name_percent (1899151069711662289) -->
+    <skip />
+    <!-- no translation found for details_title (7564809986329021063) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (2353149143338929583) -->
+    <skip />
+    <!-- no translation found for power_wifi (2382791137776486974) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (7052979399415080971) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
+    <skip />
+    <!-- no translation found for battery_action_display (5302763261448580102) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3003604969548979254) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (1834412555123982714) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for tts_settings (6454363854545277027) -->
+    <skip />
+    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (5064947197040356736) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_demo (405357591189935876) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for gadget_title (7455548605888590466) -->
+    <skip />
+    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
+    <skip />
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
+    <skip />
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
+    <skip />
+    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
+    <skip />
+    <!-- no translation found for vpn_no_button (7620339571187119107) -->
+    <skip />
+    <!-- no translation found for vpn_back_button (192036339792734970) -->
+    <skip />
+    <!-- no translation found for vpn_mistake_button (1759404628590603933) -->
+    <skip />
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <!-- no translation found for vpn_connecting (8039521381692090116) -->
+    <skip />
+    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
+    <skip />
+    <!-- no translation found for vpn_connected (7641723116362845781) -->
+    <skip />
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-sv-nokeys/strings.xml b/res/values-sv-nokeys/strings.xml
new file mode 100644
index 0000000..2af8f43
--- /dev/null
+++ b/res/values-sv-nokeys/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary">"Hantera program"</string>
+</resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
new file mode 100644
index 0000000..de6ea72
--- /dev/null
+++ b/res/values-sv/arrays.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item>"Amerika"</item>
+    <item>"Europa"</item>
+    <item>"Afrika"</item>
+    <item>"Asien"</item>
+    <item>"Australien"</item>
+    <item>"Stilla havet"</item>
+    <item>"Alla"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item>"15 sekunder"</item>
+    <item>"30 sekunder"</item>
+    <item>"1 minut"</item>
+    <item>"2 minuter"</item>
+    <item>"10 minuter"</item>
+    <item>"Ingen tidsgräns"</item>
+  </string-array>
+    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
+    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
+    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
+    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
+    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
+    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
+    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
+    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
+    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
+    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
+    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
+    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
+    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
+    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
+    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
+    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
+    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
+    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
+    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
+    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
+    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
+    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
+    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
+    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
+  <string-array name="wifi_wep_type">
+    <item>"Automatiskt"</item>
+    <item>"WEP ASCII"</item>
+    <item>"WEP-hexadecimal"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries">
+    <item>"När skärmen är avstängd"</item>
+    <item>"Aldrig när den är inkopplad"</item>
+    <item>"Aldrig"</item>
+  </string-array>
+  <string-array name="battery_history_type_spinner">
+    <item>"CPU-användning"</item>
+    <item>"Nätverksanvändning"</item>
+    <item>"GPS-användning"</item>
+    <item>"Sensoranvändning"</item>
+    <item>"Användning av delaktivering"</item>
+    <item>"Övrig användning"</item>
+  </string-array>
+  <string-array name="battery_history_which_spinner">
+    <item>"Sedan senaste bortkoppling"</item>
+    <item>"Totalt sedan start"</item>
+    <item>"Totalt"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item>"Användningstid"</item>
+    <item>"Starta räkneverk"</item>
+    <item>"Namn på program"</item>
+  </string-array>
+    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
+    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
+    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
+    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
+    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
+    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
+    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
+    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
new file mode 100644
index 0000000..94294f5
--- /dev/null
+++ b/res/values-sv/strings.xml
@@ -0,0 +1,1146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="device_info_default">"Okänd"</string>
+    <string name="turn_on_radio">"Sätt på radio"</string>
+    <string name="turn_off_radio">"Stäng av radio"</string>
+    <string name="turn_on_qxdm">"Aktivera QXDM SD-logg"</string>
+    <string name="turn_off_qxdm">"Inaktivera QXDM SD-logg"</string>
+    <string name="radioInfo_menu_viewADN">"Visa SIM-adressbok"</string>
+    <string name="radioInfo_menu_viewFDN">"Visa Fasta nummer"</string>
+    <string name="radioInfo_menu_viewSDN">"Visa tjänstenummer"</string>
+    <string name="radioInfo_menu_getPDP">"Hämta PDP-lista"</string>
+    <string name="radioInfo_menu_enableData">"Aktivera dataanslutning"</string>
+    <string name="radioInfo_menu_disableData">"Inaktivera dataanslutning"</string>
+    <string name="radioInfo_menu_enableDataOnBoot">"Aktivera data vid start"</string>
+    <string name="radioInfo_menu_disableDataOnBoot">"Inaktivera data vid start"</string>
+    <string name="radioInfo_service_in">"I tjänst"</string>
+    <string name="radioInfo_service_out">"Ur funktion"</string>
+    <string name="radioInfo_service_emergency">"Endast nödsamtal"</string>
+    <string name="radioInfo_service_off">"Radio av"</string>
+    <string name="radioInfo_roaming_in">"Roaming"</string>
+    <string name="radioInfo_roaming_not">"Ingen roaming"</string>
+    <string name="radioInfo_phone_idle">"Inaktiv"</string>
+    <string name="radioInfo_phone_ringing">"Ringer"</string>
+    <string name="radioInfo_phone_offhook">"Samtal pågår"</string>
+    <string name="radioInfo_data_disconnected">"Frånkopplad"</string>
+    <string name="radioInfo_data_connecting">"Ansluter"</string>
+    <string name="radioInfo_data_connected">"Ansluten"</string>
+    <string name="radioInfo_data_suspended">"Pausad"</string>
+    <string name="radioInfo_unknown">"okänd"</string>
+    <string name="radioInfo_display_packets">"paket"</string>
+    <string name="radioInfo_display_bytes">"bytes"</string>
+    <string name="radioInfo_display_dbm">"dBm"</string>
+    <string name="radioInfo_display_asu">"asu"</string>
+    <string name="radioInfo_lac">"LAC"</string>
+    <string name="radioInfo_cid">"CID"</string>
+    <string name="sdcard_unmount">"Montera bort SD-kort"</string>
+    <string name="sdcard_format">"Formatera SD-kort"</string>
+    <string name="small_font">"Liten"</string>
+    <string name="medium_font">"Medium"</string>
+    <string name="large_font">"Stor"</string>
+    <string name="font_size_save">"OK"</string>
+    <string name="sdcard_setting">"SD-kort"</string>
+    <string name="battery_info_status_label">"Batteristatus"</string>
+    <string name="battery_info_scale_label">"Batteriskala:"</string>
+    <string name="battery_info_level_label">"Batterinivå:"</string>
+    <string name="battery_info_health_label">"Batteriets tillstånd:"</string>
+    <string name="battery_info_technology_label">"Batteriteknik:"</string>
+    <string name="battery_info_voltage_label">"Batterispänning:"</string>
+    <string name="battery_info_voltage_units">"mV"</string>
+    <string name="battery_info_temperature_label">"Batteritemperatur:"</string>
+    <string name="battery_info_temperature_units">"° C"</string>
+    <string name="battery_info_uptime">"Tid sedan start:"</string>
+    <string name="battery_info_awake_battery">"Aktiveringstid för batteri:"</string>
+    <string name="battery_info_awake_plugged">"Aktiveringstid vid laddning:"</string>
+    <string name="battery_info_screen_on">"Skärmens PÅ-tid:"</string>
+    <string name="battery_info_status_unknown">"Okänd"</string>
+    <string name="battery_info_status_charging">"Laddar"</string>
+    <string name="battery_info_status_charging_ac">"(AC)"</string>
+    <string name="battery_info_status_charging_usb">"(USB)"</string>
+    <string name="battery_info_status_discharging">"Laddar ur"</string>
+    <string name="battery_info_status_not_charging">"Laddar inte"</string>
+    <string name="battery_info_status_full">"Fullt"</string>
+    <string name="battery_info_health_unknown">"Okänd"</string>
+    <string name="battery_info_health_good">"Bra"</string>
+    <string name="battery_info_health_overheat">"Överhettning"</string>
+    <string name="battery_info_health_dead">"Slut"</string>
+    <string name="battery_info_health_over_voltage">"Överspänning"</string>
+    <string name="battery_info_health_unspecified_failure">"Okänt fel"</string>
+    <string name="bluetooth">"Bluetooth"</string>
+    <string name="bluetooth_visibility">"Synlighet"</string>
+    <string name="bluetooth_is_discoverable">"Synlig i <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunder..."</string>
+    <string name="bluetooth_not_discoverable">"Gör enheten synlig"</string>
+    <string name="bluetooth_devices">"Bluetooth-enheter"</string>
+    <string name="bluetooth_device_name">"Enhetens namn"</string>
+    <string name="bluetooth_name_not_set">"Inget namn har angetts, använder kontonamn"</string>
+    <string name="bluetooth_scan_for_devices">"Sök efter enheter"</string>
+    <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån."</string>
+    <string name="bluetooth_connected">"Ansluten"</string>
+    <string name="bluetooth_disconnected">"Kopplas ifrån"</string>
+    <string name="bluetooth_disconnecting">"Kopplar ifrån…"</string>
+    <string name="bluetooth_connecting">"Ansluter…"</string>
+    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <skip />
+    <string name="bluetooth_not_connected">"Parkoppla med den här enheten"</string>
+    <string name="bluetooth_pairing">"Parkoppling…"</string>
+    <string name="bluetooth_paired">"Parkopplad men inte ansluten"</string>
+    <string name="bluetooth_device">"handsfree/headset"</string>
+    <string name="progress_scanning">"Skannar"</string>
+    <string name="bluetooth_notif_ticker">"Begäran om parkoppling för Bluetooth"</string>
+    <string name="bluetooth_notif_title">"Begäran om parkoppling"</string>
+    <string name="bluetooth_notif_message">"Välj att parkoppla med "</string>
+    <string name="date_and_time">"Inställningar för datum och tid"</string>
+    <string name="date_time_12_hour_sample">"Kl. 13:00"</string>
+    <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Byt tid"</string>
+    <string name="date_time_changeDate_text">"Datum"</string>
+    <string name="choose_timezone">"Välj tidszon"</string>
+    <!-- no translation found for normal_date_format (1982904221918374153) -->
+    <skip />
+    <string name="display_preview_label">"Förhandsgranska:"</string>
+    <string name="display_font_size_label">"Teckenstorlek:"</string>
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text">"Skicka <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text">"Starta <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label">"Konto:"</string>
+    <string name="proxy_clear_text">"Rensa"</string>
+    <string name="proxy_port_label">"Port"</string>
+    <string name="proxy_defaultView_text">"Återställ standardinställningar"</string>
+    <string name="proxy_action_text">"Spara"</string>
+    <string name="proxy_hostname_label">"Värdnamn"</string>
+    <string name="proxy_error">"Obs!"</string>
+    <string name="proxy_error_dismiss">"OK"</string>
+    <string name="proxy_error_invalid_host">"Värdnamnet som du har angett är inte giltigt."</string>
+    <string name="proxy_error_empty_port">"Du måste fylla i portfältet."</string>
+    <string name="proxy_error_empty_host_set_port">"Portfältet måste vara tomt om värdfältet är tomt."</string>
+    <string name="proxy_error_invalid_port">"Porten som du har angett är inte giltig."</string>
+    <string name="radio_info_signal_location_label">"Plats:"</string>
+    <string name="radio_info_neighboring_location_label">"Närliggande CID:"</string>
+    <string name="radio_info_data_attempts_label">"Dataförsök:"</string>
+    <string name="radio_info_gprs_service_label">"GPRS-tjänst:"</string>
+    <string name="radio_info_roaming_label">"Roaming:"</string>
+    <string name="radio_info_imei_label">"IMEI-kod:"</string>
+    <string name="radio_info_call_redirect_label">"Omdirigering av samtal:"</string>
+    <string name="radio_info_ppp_resets_label">"Antal PPP-återställningar sedan start:"</string>
+    <string name="radio_info_gsm_disconnects_label">"GSM kopplas från:"</string>
+    <string name="radio_info_current_network_label">"Aktuellt nätverk:"</string>
+    <string name="radio_info_data_successes_label">"Felfria data:"</string>
+    <string name="radio_info_ppp_received_label">"Mottagen PPP:"</string>
+    <string name="radio_info_gsm_service_label">"GSM-tjänst:"</string>
+    <string name="radio_info_signal_strength_label">"Signalstyrka"</string>
+    <string name="radio_info_call_status_label">"Samtalsstatus"</string>
+    <string name="radio_info_ppp_sent_label">"Skickad PPP:"</string>
+    <string name="radio_info_radio_resets_label">"Radioåterställningar:"</string>
+    <string name="radio_info_message_waiting_label">"Meddelande väntar:"</string>
+    <string name="radio_info_phone_number_label">"Telefonnummer:"</string>
+    <string name="radio_info_band_mode_label">"Välja radioband"</string>
+    <string name="radio_info_network_type_label">"Nätverkstyp"</string>
+    <string name="radio_info_set_perferred_label">"Ställ in önskad nätverkstyp:"</string>
+    <string name="radio_info_ping_ipaddr">"Ping IpAdr:"</string>
+    <string name="radio_info_ping_hostname">"Pinga värdnamn (www.google.com):"</string>
+    <string name="radio_info_http_client_test">"Test av HTTP-klient:"</string>
+    <string name="radio_info_toggle_ciph_label">"Växla kryptering"</string>
+    <string name="ping_test_label">"Köra pingtest"</string>
+    <string name="radio_info_smsc_label">"SMSC:"</string>
+    <string name="radio_info_smsc_update_label">"Uppdatera"</string>
+    <string name="radio_info_smsc_refresh_label">"Uppdatera"</string>
+    <string name="radio_info_toggle_dns_check_label">"Växla mellan DNS-kontroll"</string>
+    <string name="band_mode_title">"Ställ in GSM/UMTS-band"</string>
+    <string name="band_mode_loading">"Läser in bandlista…"</string>
+    <string name="band_mode_set">"Ställ in"</string>
+    <string name="band_mode_failed">"Misslyckades"</string>
+    <string name="band_mode_succeeded">"Lyckades"</string>
+    <string name="sdcard_changes_instructions">"Ändringarna börjar gälla när USB-kabeln har anslutits igen"</string>
+    <string name="sdcard_settings_screen_mass_storage_text">"Aktivera USB-masslagring"</string>
+    <string name="sdcard_settings_total_bytes_label">"Totalt antal bytes:"</string>
+    <string name="sdcard_settings_not_present_status">"Inget SD-kort"</string>
+    <string name="sdcard_settings_available_bytes_label">"Tillgängliga bytes:"</string>
+    <string name="sdcard_settings_mass_storage_status">"SD-kort används som enhet för masslagring"</string>
+    <string name="sdcard_settings_unmounted_status">"Det är nu säkert att ta bort SD-kortet"</string>
+    <string name="sdcard_settings_bad_removal_status">"SD-kortet togs bort medan det användes!"</string>
+    <string name="sdcard_settings_used_bytes_label">"Bytes som har använts:"</string>
+    <string name="sdcard_settings_scanning_status">"Skannar SD-kort för media…"</string>
+    <string name="sdcard_settings_read_only_status">"SD-kortet har monterats som skrivskyddat"</string>
+    <string name="next_label">"Nästa"</string>
+    <string name="language_picker_title">"Språkkod"</string>
+    <string name="select_your_language">"Välj språk"</string>
+    <string name="activity_picker_label">"Välj aktivitet"</string>
+    <string name="device_info_label">"Enhetsinfo"</string>
+    <string name="battery_info_label">"Batteriinformation"</string>
+    <string name="battery_history_label">"Batterihistorik"</string>
+    <string name="display_label">"Skärm"</string>
+    <string name="phone_info_label">"Telefoninformation"</string>
+    <string name="sd_card_settings_label">"SD-kort"</string>
+    <string name="proxy_settings_label">"Proxy-inställningar"</string>
+    <string name="cancel">"Avbryt"</string>
+    <string name="settings_label">"Inställningar"</string>
+    <!-- no translation found for settings_shortcut (3672145147925639262) -->
+    <skip />
+    <string name="airplane_mode">"Flygplansläge"</string>
+    <string name="airplane_mode_summary">"Inaktivera alla trådlösa anslutningar"</string>
+    <string name="airplane_mode_turning_on">"Inaktiverar trådlösa anslutningar…"</string>
+    <string name="airplane_mode_turning_off">"Aktivera trådlösa anslutningar..."</string>
+    <string name="radio_controls_title">"Trådlösa styrenheter"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
+    <string name="date_and_time_settings_title">"Datum och tid"</string>
+    <string name="date_and_time_settings_summary">"Ange datum, tidszon och format"</string>
+    <string name="date_time_auto">"Automatiskt"</string>
+    <string name="date_time_auto_summaryOn">"Använd värden som tillhandahålls av nätverket"</string>
+    <string name="date_time_auto_summaryOff">"Använd värden som tillhandahålls av nätverket"</string>
+    <string name="date_time_24hour">"Använd 24-timmarsformat"</string>
+    <string name="date_time_set_time">"Ange tid"</string>
+    <string name="date_time_set_timezone">"Välja tidszon"</string>
+    <string name="date_time_set_date">"Ange datum"</string>
+    <string name="date_time_date_format">"Välj datumformat"</string>
+    <string name="zone_list_menu_sort_alphabetically">"Sortera i bokstavsordning"</string>
+    <string name="zone_list_menu_sort_by_timezone">"Sortera efter tidszon"</string>
+    <string name="security_settings_title">"Säkerhet och plats"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
+    <string name="security_passwords_title">"Lösenord"</string>
+    <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_summary">"Aktivera Bluetooth"</string>
+    <string name="bluetooth_settings">"Bluetooth-inställningar"</string>
+    <string name="bluetooth_settings_title">"Bluetooth-inställningar"</string>
+    <string name="bluetooth_settings_summary">"Hantera anslutningar, ange inställningar för enhetens namn och synlighet"</string>
+    <string name="bluetooth_pin_entry">"Begäran om Bluetooth-parkoppling"</string>
+    <string name="bluetooth_device_info">"Information om Bluetooth-enhet"</string>
+    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n" Ange PIN-kod för parkoppling."\n" (Försök med 0000 eller 1234.)"</string>
+    <string name="bluetooth_error_title">"Obs!"</string>
+    <string name="bluetooth_pairing_error_message">"Ett problem inträffade när <xliff:g id="DEVICE_NAME">%1$s</xliff:g> parkopplades."</string>
+    <string name="bluetooth_pairing_pin_error_message">"Det gick inte att parkoppla <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eftersom den angivna PIN-koden är fel."</string>
+    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
+    <skip />
+    <string name="bluetooth_connecting_error_message">"Det gick inte att ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_preference_scan_title">"Sök efter enheter"</string>
+    <string name="bluetooth_device_context_connect">"Anslut"</string>
+    <string name="bluetooth_device_context_disconnect">"Koppla ifrån"</string>
+    <string name="bluetooth_device_context_pair_connect">"Parkoppla och anslut"</string>
+    <string name="bluetooth_device_context_unpair">"Ta bort parkoppling"</string>
+    <string name="bluetooth_device_context_disconnect_unpair">"Koppla ifrån och ta bort parkoppling"</string>
+    <string name="bluetooth_device_context_connect_advanced">"Alternativ..."</string>
+    <string name="bluetooth_connect_specific_profiles_title">"Anslut till…"</string>
+    <string name="bluetooth_profile_a2dp">"Media"</string>
+    <string name="bluetooth_profile_headset">"Telefon"</string>
+    <string name="bluetooth_summary_connected_to_a2dp">"Ansluten till medialjud"</string>
+    <string name="bluetooth_summary_connected_to_headset">"Ansluten till telefonens ljud"</string>
+    <string name="bluetooth_summary_connected_to_a2dp_headset">"Ansluten till telefon- och medialjud"</string>
+    <string name="bluetooth_device_advanced_title">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> alternativ"</string>
+    <string name="bluetooth_device_advanced_online_mode_title">"Anslut"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary">"Anslut till Bluetooth-enhet"</string>
+    <string name="bluetooth_device_advanced_profile_header_title">"Profiler"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected">"Ansluten till medialjud"</string>
+    <string name="bluetooth_headset_profile_summary_connected">"Ansluten till telefonens ljud"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for">"Använd för medialjud"</string>
+    <string name="bluetooth_headset_profile_summary_use_for">"Använd för telefonens ljud"</string>
+    <string name="wifi">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary">"Aktivera Wi-Fi"</string>
+    <string name="wifi_settings">"Wi-Fi-inställningar"</string>
+    <string name="wifi_settings_category">"Wi-Fi-inställningar"</string>
+    <string name="wifi_settings_summary">"Ställ in och hantera trådlösa åtkomstpunkter"</string>
+    <string name="forget_network">"Glöm"</string>
+    <string name="wifi_status">"Status"</string>
+    <string name="wifi_link_speed">"Hastighet"</string>
+    <string name="wifi_signal_3">"Utmärkt"</string>
+    <string name="wifi_signal_2">"Bra"</string>
+    <string name="wifi_signal_1">"Medel"</string>
+    <string name="wifi_signal_0">"Dåligt"</string>
+    <string name="security">"Säkerhet"</string>
+    <string name="wifi_security_open">"Öppna"</string>
+    <string name="wifi_security_wep">"WEP"</string>
+    <string name="wifi_security_wpa">"WPA"</string>
+    <string name="wifi_security_wpa2">"WPA2"</string>
+    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
+    <skip />
+    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
+    <skip />
+    <string name="wifi_security_unknown">"Okänd"</string>
+    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
+    <skip />
+    <string name="ip_address">"IP-adress"</string>
+    <string name="signal">"Signalstyrka"</string>
+    <string name="wifi_starting">"Aktiverar…"</string>
+    <string name="wifi_stopping">"Stänger av…"</string>
+    <string name="wifi_error">"Fel"</string>
+    <string name="error_starting">"Det gick inte att starta Wi-Fi"</string>
+    <string name="error_stopping">"Det gick inte att stoppa Wi-Fi"</string>
+    <string name="error_scanning">"Det går inte att söka efter nätverk"</string>
+    <string name="error_connecting">"Det gick inte att ansluta till nätverket"</string>
+    <string name="error_saving">"Det gick inte att spara nätverket"</string>
+    <string name="connect">"Anslut"</string>
+    <string name="connect_to_blank">"Anslut till <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for please_select_eap (4488240331626456338) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for please_type_identity (7061261155499513089) -->
+    <skip />
+    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
+    <skip />
+    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
+    <skip />
+    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
+    <skip />
+    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
+    <skip />
+    <string name="please_type_passphrase">"Lösenord för trådlöst"</string>
+    <string name="please_type_hex_key">"WEP-hextangent (0-9, A-F)"</string>
+    <string name="wifi_show_password">"Visa lösenord."</string>
+    <string name="scan_wifi">"Skanna"</string>
+    <string name="summary_not_in_range">"Inte i intervall"</string>
+    <!-- no translation found for summary_remembered (6079941090549401742) -->
+    <skip />
+    <string name="summary_connection_failed">"Det gick inte att ansluta. Välj om du vill försöka igen."</string>
+    <string name="wifi_access_points">"Wi-Fi-nätverk"</string>
+    <string name="wifi_type_ssid">"Nätverks-SSID"</string>
+    <string name="wifi_security">"Säkerhet"</string>
+    <string name="wifi_save_config">"Spara"</string>
+    <string name="wifi_password_unchanged">"(oförändrat)"</string>
+    <string name="wifi_add_other_network">"Lägg till Wi-Fi-nätverk"</string>
+    <string name="wifi_notify_open_networks">"Nätverksmeddelande"</string>
+    <string name="wifi_notify_open_networks_summary">"Meddela mig när ett öppet nätverk är tillgängligt"</string>
+    <string name="wifi_password_incorrect_error">"Nätverkslösenordet som du angav är fel. Försök igen."</string>
+    <string name="wifi_generic_connection_error">"Ett problem inträffade vid anslutning till nätverket. Försök igen."</string>
+    <string name="wifi_menu_advanced">"Avancerad"</string>
+    <string name="wifi_ip_settings_titlebar">"IP-inställningar"</string>
+    <string name="wifi_ip_settings_menu_save">"Spara"</string>
+    <string name="wifi_ip_settings_menu_cancel">"Avbryt"</string>
+    <string name="wifi_ip_settings_invalid_ip">"Ange en giltig IP-adress."</string>
+    <string name="wifi_use_static_ip">"Använd statisk IP"</string>
+    <string name="wifi_ip_address">"IP-adress"</string>
+    <string name="wifi_dns1">"DNS 1"</string>
+    <string name="wifi_dns2">"DNS 2"</string>
+    <string name="wifi_gateway">"Gateway"</string>
+    <string name="wifi_netmask">"Nätmask"</string>
+    <string name="wifi_context_menu_connect">"Anslut till nätverk"</string>
+    <string name="wifi_context_menu_forget">"Glöm nätverk"</string>
+    <string name="wifi_context_menu_change_password">"Byt lösenord"</string>
+    <string name="wifi_advanced_titlebar">"Avancerad"</string>
+    <string name="wifi_setting_num_channels_title">"Föreskriftsdomän"</string>
+    <string name="wifi_setting_num_channels_summary">"Ange antalet kanaler som ska användas"</string>
+    <string name="wifi_setting_num_channels_error">"Ett problem inträffande när domänen skulle anges."</string>
+    <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g>-kanaler"</string>
+    <string name="wifi_setting_sleep_policy_title">"Wi-Fi-policy"</string>
+    <string name="wifi_setting_sleep_policy_summary">"Ange när du vill växla från Wi-Fi till mobildata"</string>
+    <string name="wifi_setting_sleep_policy_error">"Ett problem inträffade när policy för viloläge skulle anges."</string>
+    <string name="wifi_advanced_mac_address_title">"Mac-adress"</string>
+    <string name="fragment_status_scanning">"Skannar…"</string>
+    <string name="fragment_status_connecting">"Ansluter till <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_authenticating">"Autentiserar med <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_obtaining_ip">"Hämtar IP-adress från <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_connected">"Ansluten till: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="fragment_status_disconnecting">"Kopplar ifrån <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_disconnected">"Frånkopplad"</string>
+    <string name="fragment_status_failed">"Misslyckades"</string>
+    <string name="status_scanning">"Skannar…"</string>
+    <string name="status_connecting">"Ansluter…"</string>
+    <string name="status_authenticating">"Autentiserar…"</string>
+    <string name="status_obtaining_ip">"Hämtar adress…"</string>
+    <string name="status_connected">"Ansluten"</string>
+    <string name="status_disconnecting">"Kopplar ifrån…"</string>
+    <string name="status_disconnected">"Frånkopplad"</string>
+    <string name="status_failed">"Misslyckades"</string>
+    <string name="sound_and_display_settings">"Ljud och skärm"</string>
+    <string name="sound_settings">"Ljudinställningar"</string>
+    <string name="sound_and_display_settings_summary">"Ställ in ringsignaler, aviseringar, skärmens ljusstryka"</string>
+    <string name="silent_mode_title">"Tyst läge"</string>
+    <string name="silent_mode_summary">"Alla ljud utom media och larm tystas"</string>
+    <string name="silent_mode_incl_alarm_summary">"Alla ljud utom media tystas"</string>
+    <string name="ringtone_title">"Telefonens ringsignal"</string>
+    <string name="ringtone_summary">"Ange standardringsignal för inkommande samtal"</string>
+    <string name="ring_volume_title">"Ringvolym"</string>
+    <string name="ring_volume_summary">"Ställ in volym för inkommande samtal och aviseringar"</string>
+    <string name="vibrate_title">"Telefonvibration"</string>
+    <string name="vibrate_summary">"Telefonen vibrerar vid inkommande samtal"</string>
+    <string name="notification_sound_title">"Ringsignal för avisering"</string>
+    <string name="notification_sound_summary">"Ställ in standardsignal för avisering"</string>
+    <string name="incoming_call_volume_title">"Volym för inkommande samtal"</string>
+    <string name="notification_volume_title">"Aviseringsvolym"</string>
+    <string name="checkbox_notification_same_as_incoming_call">"Använd volymen för inkommande samtal vid avisering"</string>
+    <string name="notification_sound_dialog_title">"Välj ringsignal för avisering"</string>
+    <string name="media_volume_title">"Mediavolym"</string>
+    <string name="media_volume_summary">"Ställ in volym för musik och video"</string>
+    <string name="dtmf_tone_enable_title">"Knappljud"</string>
+    <string name="dtmf_tone_enable_summary_on">"Spela upp signaler när knappsatsen används"</string>
+    <string name="dtmf_tone_enable_summary_off">"Spela upp signaler när knappsatsen används"</string>
+    <string name="sound_effects_enable_title">"Välj ljud"</string>
+    <string name="sound_effects_enable_summary_on">"Spela upp ljud när du väljer på skärmen"</string>
+    <string name="sound_effects_enable_summary_off">"Spela upp ljud när du väljer något på skärmen"</string>
+    <string name="play_media_notification_sounds_enable_title">"Aviseringar för SD-kort"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
+    <skip />
+    <string name="sync_settings">"Datasynkronisering"</string>
+    <string name="sync_settings_summary">"Välj vilka program som ska synkroniserats"</string>
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
+    <string name="display_settings">"Visa inställningar"</string>
+    <string name="animations_title">"Animering"</string>
+    <string name="animations_summary_on">"Visa animering när fönster öppnas och stängs"</string>
+    <string name="animations_summary_off">"Visa animering när fönster öppnas och stängs"</string>
+    <string name="accelerometer_title">"Riktning"</string>
+    <string name="accelerometer_summary_on">"Växla riktning automatiskt när du roterar telefonen"</string>
+    <string name="accelerometer_summary_off">"Byt riktning automatiskt när du roterar telefonen"</string>
+    <string name="brightness">"Ljusstyrka"</string>
+    <string name="brightness_summary">"Ändra skärmens ljusstyrka"</string>
+    <string name="screen_timeout">"Skärmens tidsgräns"</string>
+    <string name="screen_timeout_summary">"Justera fördröjningen innan skärmen stängs av automatiskt"</string>
+    <string name="sim_lock_settings">"Låsinställningar för SIM-kort"</string>
+    <string name="sim_lock_settings_category">"Ställ in lås för SIM-kort"</string>
+    <string name="sim_lock_settings_title">"Lås för SIM-kort"</string>
+    <string name="sim_pin_toggle">"Lås SIM-kort"</string>
+    <string name="sim_lock_on">"PIN-kod krävs för att använda telefonen"</string>
+    <string name="sim_lock_off">"PIN-kod krävs för att använda telefonen"</string>
+    <string name="sim_pin_change">"Byt PIN-kod"</string>
+    <string name="sim_enter_pin">"PIN-kod för SIM-kort"</string>
+    <string name="sim_enable_sim_lock">"Lås SIM-kort"</string>
+    <string name="sim_disable_sim_lock">"Lås upp SIM-kort"</string>
+    <string name="sim_enter_old">"Gammal PIN-kod för SIM-kort"</string>
+    <string name="sim_enter_new">"Ny PIN-kod för SIM-kort"</string>
+    <string name="sim_reenter_new">"Ange den nya PIN-koden igen"</string>
+    <string name="sim_change_pin">"PIN-kod för SIM-kort"</string>
+    <string name="sim_bad_pin">"Fel PIN-kod!"</string>
+    <string name="sim_pins_dont_match">"PIN-koder matchar inte!"</string>
+    <string name="sim_change_failed">"Det går inte att ändra PIN-koden."\n" Förmodligen fel PIN-kod."</string>
+    <string name="sim_change_succeeded">"SIM-kortets PIN-kod har ändrats"</string>
+    <string name="sim_lock_failed">"Det gick inte att ändra SIM-kortets låsstatus."\n"Du kan ha angett fel PIN-kod."</string>
+    <string name="sim_enter_ok">"OK"</string>
+    <string name="sim_enter_cancel">"Avbryt"</string>
+    <string name="device_info_settings">"Telefonens status"</string>
+    <string name="system_update_settings_list_item_title">"Systemuppdateringar"</string>
+    <string name="system_update_settings_list_item_summary">"Leta efter systemuppdateringar"</string>
+    <string name="firmware_version">"Fast programvara"</string>
+    <string name="model_number">"Modellnummer"</string>
+    <string name="baseband_version">"Basbandsversion"</string>
+    <string name="kernel_version">"Kernel-version"</string>
+    <string name="build_number">"Skapa nummer"</string>
+    <string name="device_info_not_available">"Inte tillgänglig"</string>
+    <string name="device_status_activity_title">"Status"</string>
+    <string name="device_status">"Status"</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
+    <string name="storage_settings_title">"SD-kort och telefonlagr."</string>
+    <string name="storage_settings_summary">"Montera bort SD-kort, visa tillgängligt lagringsutrymme"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
+    <string name="status_network_type">"Mobil nätverkstyp"</string>
+    <string name="status_data_state">"Status för mobilt nätverk"</string>
+    <string name="status_service_state">"Tjänststatus"</string>
+    <string name="status_signal_strength">"Signalstyrka"</string>
+    <string name="status_roaming">"Roaming"</string>
+    <string name="status_operator">"Nätverk"</string>
+    <string name="status_wifi_mac_address">"Wi-Fi Mac-adress"</string>
+    <string name="status_bt_address">"Bluetooth-adress"</string>
+    <string name="status_unavailable">"Inte tillgängligt"</string>
+    <string name="status_up_time">"Tid sedan systemstart"</string>
+    <string name="status_awake_time">"Aktiveringstid"</string>
+    <string name="internal_memory">"Intern telefonlagring"</string>
+    <string name="sd_memory">"SD-kort"</string>
+    <string name="memory_available">"Tillgängligt utrymme"</string>
+    <string name="memory_size">"Totalt utrymme"</string>
+    <string name="sd_eject">"Montera bort SD-kort"</string>
+    <string name="sd_eject_summary">"Montera bort SD-kortet för säker borttagning"</string>
+    <string name="sd_format">"Formatera SD-kort"</string>
+    <string name="sd_format_summary">"Formatera (radera) SD-kortet"</string>
+    <string name="sd_unavailable">"Inte tillgängligt"</string>
+    <string name="read_only">" (Skrivskyddad)"</string>
+    <string name="battery_status_title">"Batteristatus"</string>
+    <string name="battery_level_title">"Batterinivå"</string>
+    <string name="apn_settings">"APN:er"</string>
+    <string name="apn_edit">"Redigera åtkomstpunkt"</string>
+    <string name="apn_not_set">"&lt;Har inte angetts&gt;"</string>
+    <string name="apn_name">"Namn"</string>
+    <string name="apn_apn">"APN"</string>
+    <string name="apn_http_proxy">"Proxy"</string>
+    <string name="apn_http_port">"Port"</string>
+    <string name="apn_user">"Användarnamn"</string>
+    <string name="apn_password">"Lösenord"</string>
+    <string name="apn_server">"Server"</string>
+    <string name="apn_mmsc">"MMSC"</string>
+    <string name="apn_mms_proxy">"MMS-proxy"</string>
+    <string name="apn_mms_port">"MMS-port"</string>
+    <string name="apn_mcc">"MCC"</string>
+    <string name="apn_mnc">"MNC"</string>
+    <string name="apn_type">"APN-typ"</string>
+    <string name="menu_delete">"Ta bort APN"</string>
+    <string name="menu_new">"Nytt APN"</string>
+    <string name="menu_save">"Spara"</string>
+    <string name="menu_cancel">"Släng"</string>
+    <string name="error_title">"Obs!"</string>
+    <string name="error_name_empty">"Fältet Namn får inte vara tomt"</string>
+    <string name="error_apn_empty">"APN får inte vara tomt"</string>
+    <string name="error_mcc_not3">"MCC-fältet måste bestå av 3 siffror."</string>
+    <string name="error_mnc_not23">"MNC-fältet måste vara 2 eller 3 siffror"</string>
+    <string name="restore_default_apn">"Återställer standardinställning för APN"</string>
+    <string name="menu_restore">"Återställ standardinst."</string>
+    <string name="restore_default_apn_completed">"Återställning av standardinställningar för APN har slutförts"</string>
+    <string name="master_clear_title">"Återställ standardinställningar"</string>
+    <string name="master_clear_summary">"Raderar alla data på telefonen"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
+    <string name="master_clear_button_text">"Återställ telefonen"</string>
+    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
+    <skip />
+    <string name="master_clear_final_button_text">"Radera allt"</string>
+    <string name="master_clear_gesture_prompt">"Rita ditt grafiska lösenord"</string>
+    <string name="master_clear_gesture_explanation">"Du måste rita ditt grafiska lösenord om du vill återställa telefonen."</string>
+    <string name="master_clear_failed">"Återställningen utfördes inte eftersom tjänsten för systemrensning inte är tillgänglig."</string>
+    <string name="media_format_title">"Formatera SD-kort"</string>
+    <string name="media_format_summary">"Tar bort alla data på SD-kortet"</string>
+    <string name="media_format_desc">"Den här åtgärden raderar SD-kortet i telefonen. ALLA data på kortet försvinner!"</string>
+    <string name="media_format_button_text">"Formatera SD-kort"</string>
+    <string name="media_format_final_desc">"Formatera SD-kort, radera alla mediafiler? Åtgärden kan inte ångras!"</string>
+    <string name="media_format_final_button_text">"Radera allt"</string>
+    <string name="media_format_gesture_prompt">"Rita ditt grafiska lösenord"</string>
+    <string name="media_format_gesture_explanation">"Du måste rita ditt grafiska lösenord för att bekräfta formateringen av SD-kortet."</string>
+    <string name="call_settings_title">"Samtalsinställningar"</string>
+    <string name="call_settings_summary">"Ställ in röstbrevlåda, vidarebefordra samtal, samtal väntar, nummerpres."</string>
+    <string name="network_settings_title">"Mobila nätverk"</string>
+    <string name="network_settings_summary">"Ställ in alternativ för roaming, nätverk, APN:er"</string>
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
+    <string name="location_network_based">"Använd trådlösa nätverk"</string>
+    <string name="location_networks_disabled">"Se plats i programmen (till exempel kartor) med hjälp av trådlösa nätverk"</string>
+    <string name="location_neighborhood_level">"Plats fastställs av Wi-Fi och/eller mobila nätverk"</string>
+    <string name="location_gps">"Aktivera GPS-satelliter"</string>
+    <string name="location_street_level">"När du söker, korrekt till gatunivå (avmarkera om du vill spara batteri)"</string>
+    <string name="location_gps_disabled">"Hitta till gatunivå (kräver mer batteri och fungerar endast utomhus)"</string>
+    <!-- no translation found for use_location_title (7585990952633568732) -->
+    <skip />
+    <!-- no translation found for use_location_summary (4411467143899877395) -->
+    <skip />
+    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
+    <skip />
+    <string name="agree">"Jag godkänner"</string>
+    <string name="disagree">"Godkänn inte"</string>
+    <string name="about_settings">"Om telefonen"</string>
+    <string name="about_settings_summary">"Visa juridisk information, telefonstatus, programversion"</string>
+    <string name="legal_information">"Juridisk information"</string>
+    <string name="contributors_title">"Medarbetare"</string>
+    <string name="copyright_title">"Upphovsrätt"</string>
+    <string name="license_title">"Licens"</string>
+    <string name="terms_title">"Användarvillkor"</string>
+    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
+    <skip />
+    <string name="system_tutorial_list_item_summary">"Lär dig hur du använder din telefon"</string>
+    <string name="settings_license_activity_title">"Öppen källkodslicens"</string>
+    <string name="settings_license_activity_unavailable">"Ett problem inträffade när licenserna lästes in."</string>
+    <string name="settings_license_activity_loading">"Läser in…"</string>
+    <string name="lock_settings_title">"Skärmens grafiska lösenord"</string>
+    <string name="lockpattern_change_lock_pattern_label">"Byt grafiskt lösenord"</string>
+    <string name="lockpattern_need_to_unlock">"Bekräfta sparat grafiskt lösenord"</string>
+    <string name="lockpattern_need_to_unlock_wrong">"Försök igen:"</string>
+    <string name="lockpattern_recording_intro_header">"Rita ett grafiskt lösenord"</string>
+    <string name="lockpattern_recording_intro_footer">"Tryck på Meny om du vill ha hjälp."</string>
+    <string name="lockpattern_recording_inprogress">"Lyft fingret när du är klar."</string>
+    <string name="lockpattern_recording_incorrect_too_short">"Anslut minst <xliff:g id="NUMBER">%d</xliff:g> punkter. Försök igen:"</string>
+    <string name="lockpattern_pattern_entered_header">"Det grafiska lösenordet har registrerats!"</string>
+    <string name="lockpattern_need_to_confirm">"Rita ditt grafiska lösenord igen för att bekräfta:"</string>
+    <string name="lockpattern_pattern_confirmed_header">"Ditt nya grafiska lösenord:"</string>
+    <string name="lockpattern_confirm_button_text">"Bekräfta"</string>
+    <string name="lockpattern_restart_button_text">"Rita igen"</string>
+    <string name="lockpattern_retry_button_text">"Försök igen"</string>
+    <string name="lockpattern_continue_button_text">"Fortsätt"</string>
+    <string name="lockpattern_settings_title">"Grafiskt lösenord"</string>
+    <string name="lockpattern_settings_enable_title">"Begär grafiskt lösenord"</string>
+    <string name="lockpattern_settings_enable_summary">"Måste rita grafiskt lösenord för att låsa upp skärmen"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">"Anv. synligt graf. lös."</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"Använd känslig feedback"</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"Ange grafiskt lösenord"</string>
+    <string name="lockpattern_settings_change_lock_pattern">"Byt grafiskt lösenord"</string>
+    <string name="lockpattern_settings_help_how_to_record">"Så här ritar du ett grafiskt lösenord"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"För många felaktiga försök!"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Försök igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
+    <string name="skip_button_label">"Avbryt"</string>
+    <string name="next_button_label">"Nästa"</string>
+    <string name="lock_title">"Skydda din telefon"</string>
+    <string name="lock_intro_message"><font size="17">"Skydda din telefon från obehörig användning genom att skapa ett personligt grafiskt lösenord på skärmen. "\n<font height="17">\n</font>"1"<b></b>"  Se hur ett grafiskt lösenord ritas på nästa skärm. "\n<font height="17">\n</font><b>"2"</b>" Rita ditt eget grafiska lösenord. Experimentera med olika grafiska lösenord men anslut minst fyra punkter. "\n<font height="17">\n</font><b>"3"</b>"  Rita ditt grafiska lösenord igen för att bekräfta. "\n<font height="17">\n</font><b>" Är du redo att börja? Välj Nästa"</b>". "\n<font height="3">\n</font>"Välj Avbryt om du vill lämna telefonen oskyddad."</font></string>
+    <string name="lock_example_title">"Exempel på grafiskt lösenord"</string>
+    <string name="lock_example_message">"Anslut minst fyra punkter."\n" "\n"Välj Nästa när du vill rita ditt eget grafiska lösenord."</string>
+    <string name="manageapplications_settings_title">"Hantera program"</string>
+    <string name="manageapplications_settings_summary">"Hantera och ta bort installerade program"</string>
+    <string name="applications_settings">"Program"</string>
+    <string name="applications_settings_summary">"Hantera program, ställ in genvägar för snabbstart"</string>
+    <string name="applications_settings_header">"Programinställningar"</string>
+    <string name="install_applications">"Okända källor"</string>
+    <string name="install_unknown_applications">"Tillåt installation av program som inte finns i butiken"</string>
+    <string name="install_all_warning">"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">"Programinformation"</string>
+    <string name="storage_label">"Lagring"</string>
+    <string name="auto_launch_label">"Starta som standard"</string>
+    <string name="permissions_label">"Behörigheter"</string>
+    <string name="cache_header_label">"Cacheminne"</string>
+    <string name="clear_cache_btn_text">"Rensa cacheminne"</string>
+    <string name="cache_size_label">"Cacheminne"</string>
+    <string name="controls_label">"Kontroller"</string>
+    <string name="force_stop">"Tvingad avslutning"</string>
+    <string name="total_size_label">"Totalt"</string>
+    <string name="application_size_label">"Program"</string>
+    <string name="data_size_label">"Data"</string>
+    <string name="uninstall_text">"Avinstallera"</string>
+    <string name="clear_user_data_text">"Rensa data"</string>
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
+    <string name="auto_launch_enable_text">"Du har valt att starta detta program som standard för vissa åtgärder."</string>
+    <string name="auto_launch_disable_text">"Inga standardinställningar har angetts."</string>
+    <string name="clear_activities">"Rensa standardinställn."</string>
+    <string name="unknown">"Okänd"</string>
+    <string name="sort_order_alpha">"Sortera"</string>
+    <string name="sort_order_size">"Sortera efter storlek"</string>
+    <string name="manage_space_text">"Hantera utrymme"</string>
+    <string name="filter">"Filtrera"</string>
+    <string name="filter_dlg_title">"Välj filteralternativ"</string>
+    <string name="filter_apps_all">"Alla"</string>
+    <string name="filter_apps_third_party">"Tredje part"</string>
+    <string name="filter_apps_running">"Kör"</string>
+    <string name="loading">"Läser in…"</string>
+    <string name="recompute_size">"Räknar om storlek…"</string>
+    <string name="clear_data_dlg_title">"Radera"</string>
+    <string name="clear_data_dlg_text">"All information som du har sparat i detta program tas bort permanent."</string>
+    <string name="dlg_ok">"OK"</string>
+    <string name="dlg_cancel">"Avbryt"</string>
+    <string name="app_not_found_dlg_title">"Programmet hittades inte"</string>
+    <string name="app_not_found_dlg_text">"Programmet fanns inte med i listan över installerade program."</string>
+    <string name="clear_data_failed">"Det gick inte att rensa programdata."</string>
+    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
+    <skip />
+    <string name="security_settings_desc">"Med det här programmet kommer du åt följande på din telefon:"</string>
+    <string name="computing_size">"Beräkningar…"</string>
+    <string name="invalid_size_value">"Det gick inte att räkna ut paketstorlek"</string>
+    <string name="empty_list_msg">"Du har inte installerat några program från tredje part."</string>
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
+    <string name="language_settings">"Språkkod och text"</string>
+    <string name="language_settings_summary">"Ställ in alternativ för språkkod (land och område), textinmatning och autokorrigering"</string>
+    <string name="language_category">"Språkkodsinställningar"</string>
+    <string name="text_category">"Textinställningar"</string>
+    <string name="phone_language">"Välj språkkod"</string>
+    <string name="phone_language_summary">"Välj språk och område"</string>
+    <string name="auto_replace">"Ersätt automatiskt"</string>
+    <string name="auto_replace_summary">"Rätta felskrivna ord"</string>
+    <string name="auto_caps">"Inled med versal"</string>
+    <string name="auto_caps_summary">"Första bokstaven i meningar ska inledas med versal"</string>
+    <string name="auto_punctuate">"Automatisk punkt"</string>
+    <string name="hardkeyboard_category">"Inställningar för fysiskt tangentbord"</string>
+    <string name="auto_punctuate_summary">"Tryck på blanksteg två gånger om du vill infoga \".\""</string>
+    <string name="show_password">"Synliga lösenord"</string>
+    <string name="show_password_summary">"Visa lösenord när du skriver"</string>
+    <string name="ime_security_warning">"Den här inmatningsmetoden kan samla all text som du anger, inklusive personliga uppgifter som lösenord och kreditkortsnummer. Den kommer från programmet <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Ska inmatningsmetoden aktiveras?"</string>
+    <string name="user_dict_settings_titlebar">"Användarens ordlista"</string>
+    <string name="user_dict_settings_title">"Användarens ordlista"</string>
+    <string name="user_dict_settings_summary">"Lägg till och ta bort ord från användarens ordlista"</string>
+    <string name="user_dict_settings_add_menu_title">"Lägga till"</string>
+    <string name="user_dict_settings_add_dialog_title">"Lägga till i ordlista"</string>
+    <string name="user_dict_settings_edit_dialog_title">"Redigera ord"</string>
+    <string name="user_dict_settings_context_menu_edit_title">"Redigera"</string>
+    <string name="user_dict_settings_context_menu_delete_title">"Radera"</string>
+    <string name="user_dict_settings_empty_text">"Det finns inga ord i användarordlistan. Du lägger till ord från menyn."</string>
+    <string name="testing">"Testa"</string>
+    <string name="testing_phone_info">"Telefoninformation"</string>
+    <string name="testing_battery_info">"Batteriinformation"</string>
+    <string name="testing_battery_history">"Batterihistorik"</string>
+    <string name="quick_launch_title">"Snabbstart"</string>
+    <string name="quick_launch_summary">"Ställ in kortkommandon för att starta program"</string>
+    <string name="quick_launch_assign_application">"Tilldela program"</string>
+    <string name="quick_launch_no_shortcut">"Ingen genväg"</string>
+    <string name="quick_launch_shortcut">"Sök + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
+    <string name="quick_launch_clear_dialog_title">"Rensa"</string>
+    <string name="quick_launch_clear_dialog_message">"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">"OK"</string>
+    <string name="quick_launch_clear_cancel_button">"Avbryt"</string>
+    <string name="quick_launch_display_mode_applications">"Program"</string>
+    <string name="quick_launch_display_mode_shortcuts">"Genvägar"</string>
+    <string name="input_methods_settings_title">"Textinmatning"</string>
+    <string name="input_methods_settings_summary">"Hantera textinmatningsalternativ"</string>
+    <string name="input_methods_settings_label_format">"<xliff:g id="IME_NAME">%1$s</xliff:g>-inställningar"</string>
+    <string name="onscreen_keyboard_settings_summary">"Inställningar för skärmtangentbord"</string>
+    <string name="builtin_keyboard_settings_title">"Enhetens knappsats"</string>
+    <string name="builtin_keyboard_settings_summary">"Inställningar för inbyggt tangentbord"</string>
+    <string name="development_settings_title">"Utveckling"</string>
+    <string name="development_settings_summary">"Ange alternativ för programutveckling"</string>
+    <string name="enable_adb">"USB-felsökning"</string>
+    <string name="enable_adb_summary">"Felsökningsläge när USB har anslutits"</string>
+    <string name="keep_screen_on">"Håll aktiverad"</string>
+    <string name="keep_screen_on_summary">"Skärmen vilar aldrig när laddning pågår"</string>
+    <string name="allow_mock_location">"Tillåt skenplatser"</string>
+    <string name="allow_mock_location_summary">"Tillåt skenplatser"</string>
+    <!-- no translation found for adb_warning_title (1756027479229533250) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (5352555112049663033) -->
+    <skip />
+    <string name="gadget_picker_title">"Välj gadget"</string>
+    <string name="widget_picker_title">"Välj widget"</string>
+    <string name="battery_history_details_for">"Information för användar-id %d"</string>
+    <string name="battery_history_uid">"Användar-id <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
+    <string name="battery_history_network_usage">"Information om nätverksanvändning för <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
+    <string name="battery_history_bytes_received">"Mottagna bytes: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_sent">"Skickade bytes: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_total">"Totalt antal byte: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_cpu_usage">"Information om CPU-användning för <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
+    <string name="battery_history_user_time">"Användartid"</string>
+    <string name="battery_history_system_time">"Systemtid:"</string>
+    <string name="battery_history_total_time">"Total tid:"</string>
+    <string name="battery_history_starts">"Startar: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
+    <string name="battery_history_packages_sharing_this_uid">"Paket som delar denna UID:"</string>
+    <string name="battery_history_no_data">"Ingen information om batterianvändning är tillgänglig"</string>
+    <string name="battery_history_sensor">"Sensor:"</string>
+    <string name="battery_history_wakelock">"Delaktiveringslås:"</string>
+    <string name="battery_history_used_by_packages">"Sensor som används av paket:"</string>
+    <string name="battery_history_sensor_usage">"Har använts <xliff:g id="COUNT">%1$d</xliff:g> gånger av <xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
+    <string name="battery_history_sensor_usage_multi">"Har använts <xliff:g id="COUNT">%1$d</xliff:g> gånger av en av:"</string>
+    <string name="battery_history_awake_label">"Kör"</string>
+    <string name="battery_history_screen_on_label">"Skärm på"</string>
+    <string name="battery_history_phone_on_label">"Telefon på"</string>
+    <string name="battery_history_awake">"Tid som har tillbringats utan vilotid:"</string>
+    <string name="battery_history_screen_on">"Tid då skärmen har varit aktiverad:"</string>
+    <string name="battery_history_phone_on">"Tid då telefonen har varit aktiverad:"</string>
+    <string name="battery_history_screen_on_battery">"På batteri:"</string>
+    <string name="battery_history_screen_on_plugged">"Inkopplad:"</string>
+    <string name="usage_stats_label">"Användningsstatistik"</string>
+    <string name="testing_usage_stats">"Användningsstatistik"</string>
+    <string name="display_order_text">"Sortera efter"</string>
+    <string name="app_name_label">"Program"</string>
+    <string name="launch_count_label">"Räkneverk"</string>
+    <string name="usage_time_label">"Användningstid"</string>
+    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
+    <skip />
+    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
+    <skip />
+    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
+    <skip />
+    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (4630925382578609056) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
+    <skip />
+    <!-- no translation found for usage_name_percent (1899151069711662289) -->
+    <skip />
+    <!-- no translation found for details_title (7564809986329021063) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (2353149143338929583) -->
+    <skip />
+    <!-- no translation found for power_wifi (2382791137776486974) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (7052979399415080971) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
+    <skip />
+    <!-- no translation found for battery_action_display (5302763261448580102) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3003604969548979254) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (1834412555123982714) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for tts_settings (6454363854545277027) -->
+    <skip />
+    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (5064947197040356736) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_demo (405357591189935876) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for gadget_title (7455548605888590466) -->
+    <skip />
+    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
+    <skip />
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
+    <skip />
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
+    <skip />
+    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
+    <skip />
+    <!-- no translation found for vpn_no_button (7620339571187119107) -->
+    <skip />
+    <!-- no translation found for vpn_back_button (192036339792734970) -->
+    <skip />
+    <!-- no translation found for vpn_mistake_button (1759404628590603933) -->
+    <skip />
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <!-- no translation found for vpn_connecting (8039521381692090116) -->
+    <skip />
+    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
+    <skip />
+    <!-- no translation found for vpn_connected (7641723116362845781) -->
+    <skip />
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
+</resources>
diff --git a/res/values-tr-nokeys/strings.xml b/res/values-tr-nokeys/strings.xml
new file mode 100644
index 0000000..299929b
--- /dev/null
+++ b/res/values-tr-nokeys/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary">"Uygulamaları yönet"</string>
+</resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
new file mode 100644
index 0000000..a038e47
--- /dev/null
+++ b/res/values-tr/arrays.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item>"Amerika"</item>
+    <item>"Avrupa"</item>
+    <item>"Afrika"</item>
+    <item>"Asya"</item>
+    <item>"Avustralya"</item>
+    <item>"Pasifik"</item>
+    <item>"Tümü"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item>"15 saniye"</item>
+    <item>"30 saniye"</item>
+    <item>"1 dakika"</item>
+    <item>"2 dakika"</item>
+    <item>"10 dakika"</item>
+    <item>"Asla zaman aşımına uğrama"</item>
+  </string-array>
+    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
+    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
+    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
+    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
+    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
+    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
+    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
+    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
+    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
+    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
+    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
+    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
+    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
+    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
+    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
+    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
+    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
+    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
+    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
+    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
+    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
+    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
+    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
+    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
+  <string-array name="wifi_wep_type">
+    <item>"Otomatik"</item>
+    <item>"WEP ASCII"</item>
+    <item>"WEP onaltılık"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries">
+    <item>"Ekran kapandığında"</item>
+    <item>"Takılı olduğunda hiçbir zaman"</item>
+    <item>"Hiçbir zaman"</item>
+  </string-array>
+  <string-array name="battery_history_type_spinner">
+    <item>"CPU kullanımı"</item>
+    <item>"Ağ kullanımı"</item>
+    <item>"GPS kullanımı"</item>
+    <item>"Algılayıcı kullanımı"</item>
+    <item>"Kısmi uyandırma kullanımı"</item>
+    <item>"Diğer kullanım"</item>
+  </string-array>
+  <string-array name="battery_history_which_spinner">
+    <item>"Fişten son çıkarmadan bu yana"</item>
+    <item>"Açılıştan bu yana toplam"</item>
+    <item>"Tüm zamanlardaki toplam"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item>"Kullanım Süresi"</item>
+    <item>"Sayımı Başlat"</item>
+    <item>"Uygulama Adı"</item>
+  </string-array>
+    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
+    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
+    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
+    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
+    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
+    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
+    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
+    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
+</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
new file mode 100644
index 0000000..8e5bb12
--- /dev/null
+++ b/res/values-tr/strings.xml
@@ -0,0 +1,1146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="device_info_default">"Bilinmiyor"</string>
+    <string name="turn_on_radio">"Radyoyu aç"</string>
+    <string name="turn_off_radio">"Radyoyu kapat"</string>
+    <string name="turn_on_qxdm">"QXDM SD günlüğünü etkinleştir"</string>
+    <string name="turn_off_qxdm">"QXDM SD günlüğünü devre dışı bırak"</string>
+    <string name="radioInfo_menu_viewADN">"SIM adres defterini görüntüle"</string>
+    <string name="radioInfo_menu_viewFDN">"Sabit Arama Numaralarını Görüntüle"</string>
+    <string name="radioInfo_menu_viewSDN">"Hizmet Arama Numaralarını Görüntüle"</string>
+    <string name="radioInfo_menu_getPDP">"PDP listesini al"</string>
+    <string name="radioInfo_menu_enableData">"Veri bağlantısını etkinleştir"</string>
+    <string name="radioInfo_menu_disableData">"Veri bağlantısını devre dışı bırak"</string>
+    <string name="radioInfo_menu_enableDataOnBoot">"Açılışta verileri etkinleştir"</string>
+    <string name="radioInfo_menu_disableDataOnBoot">"Açılışta verileri devre dışı bırak"</string>
+    <string name="radioInfo_service_in">"Hizmette"</string>
+    <string name="radioInfo_service_out">"Hizmet dışı"</string>
+    <string name="radioInfo_service_emergency">"Yalnızca acil çağrılar için"</string>
+    <string name="radioInfo_service_off">"Radyo kapalı"</string>
+    <string name="radioInfo_roaming_in">"Dolaşım"</string>
+    <string name="radioInfo_roaming_not">"Dolaşımda değil"</string>
+    <string name="radioInfo_phone_idle">"Boşta"</string>
+    <string name="radioInfo_phone_ringing">"Çalıyor"</string>
+    <string name="radioInfo_phone_offhook">"Çağrı sürüyor"</string>
+    <string name="radioInfo_data_disconnected">"Bağlantı kesildi"</string>
+    <string name="radioInfo_data_connecting">"Bağlanıyor"</string>
+    <string name="radioInfo_data_connected">"Bağlandı"</string>
+    <string name="radioInfo_data_suspended">"Askıya alındı"</string>
+    <string name="radioInfo_unknown">"bilinmiyor"</string>
+    <string name="radioInfo_display_packets">"pkt"</string>
+    <string name="radioInfo_display_bytes">"bayt"</string>
+    <string name="radioInfo_display_dbm">"dBm"</string>
+    <string name="radioInfo_display_asu">"asu"</string>
+    <string name="radioInfo_lac">"LAC"</string>
+    <string name="radioInfo_cid">"CID"</string>
+    <string name="sdcard_unmount">"SD kartının bağlantısını kes"</string>
+    <string name="sdcard_format">"SD kartı biçimlendir"</string>
+    <string name="small_font">"Küçük"</string>
+    <string name="medium_font">"Ortam"</string>
+    <string name="large_font">"Büyük"</string>
+    <string name="font_size_save">"Tamam"</string>
+    <string name="sdcard_setting">"SD kart"</string>
+    <string name="battery_info_status_label">"Pil durumu:"</string>
+    <string name="battery_info_scale_label">"Pil skalası:"</string>
+    <string name="battery_info_level_label">"Pil düzeyi:"</string>
+    <string name="battery_info_health_label">"Pil gücü:"</string>
+    <string name="battery_info_technology_label">"Pil teknolojisi:"</string>
+    <string name="battery_info_voltage_label">"Pil voltajı:"</string>
+    <string name="battery_info_voltage_units">"mV"</string>
+    <string name="battery_info_temperature_label">"Pil ısısı:"</string>
+    <string name="battery_info_temperature_units">"° C"</string>
+    <string name="battery_info_uptime">"Açılıştan bu yana geçen süre:"</string>
+    <string name="battery_info_awake_battery">"Pil ile uyanık geçen süre:"</string>
+    <string name="battery_info_awake_plugged">"Şarj ederken uyanık geçen süre:"</string>
+    <string name="battery_info_screen_on">"Ekran AÇIK kalma süresi:"</string>
+    <string name="battery_info_status_unknown">"Bilinmiyor"</string>
+    <string name="battery_info_status_charging">"Şarj oluyor"</string>
+    <string name="battery_info_status_charging_ac">"(AC)"</string>
+    <string name="battery_info_status_charging_usb">"(USB)"</string>
+    <string name="battery_info_status_discharging">"Boşaltılıyor"</string>
+    <string name="battery_info_status_not_charging">"Şarj etmiyor"</string>
+    <string name="battery_info_status_full">"Dolu"</string>
+    <string name="battery_info_health_unknown">"Bilinmiyor"</string>
+    <string name="battery_info_health_good">"İyi"</string>
+    <string name="battery_info_health_overheat">"Aşırı ısınma"</string>
+    <string name="battery_info_health_dead">"Ölü"</string>
+    <string name="battery_info_health_over_voltage">"Aşırı voltaj"</string>
+    <string name="battery_info_health_unspecified_failure">"Bilinmeyen hata"</string>
+    <string name="bluetooth">"Bluetooth"</string>
+    <string name="bluetooth_visibility">"Keşfedilebilir"</string>
+    <string name="bluetooth_is_discoverable">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> saniye için keşfedilebilir…"</string>
+    <string name="bluetooth_not_discoverable">"Cihazı keşfedilebilir yap"</string>
+    <string name="bluetooth_devices">"Bluetooth cihazlar"</string>
+    <string name="bluetooth_device_name">"Cihaz adı"</string>
+    <string name="bluetooth_name_not_set">"Ad ayarlanmadı, hesap adı kullanılıyor"</string>
+    <string name="bluetooth_scan_for_devices">"Cihazları tara"</string>
+    <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bağlantısı kesilecek."</string>
+    <string name="bluetooth_connected">"Bağlandı"</string>
+    <string name="bluetooth_disconnected">"Bağlantı kesildi"</string>
+    <string name="bluetooth_disconnecting">"Bağlantı kesiliyor…"</string>
+    <string name="bluetooth_connecting">"Bağlanıyor…"</string>
+    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <skip />
+    <string name="bluetooth_not_connected">"Bu cihaz ile eşleştir"</string>
+    <string name="bluetooth_pairing">"Eşleştiriliyor…"</string>
+    <string name="bluetooth_paired">"Eşleşti ancak bağlanmadı"</string>
+    <string name="bluetooth_device">"eller boşta/kulaklıklı mikrofon seti"</string>
+    <string name="progress_scanning">"Taranıyor"</string>
+    <string name="bluetooth_notif_ticker">"Bluetooth eşleşme isteği"</string>
+    <string name="bluetooth_notif_title">"Eşleşme isteği"</string>
+    <string name="bluetooth_notif_message">"Eşleşmek için seç "</string>
+    <string name="date_and_time">"Tarih ve saat ayarları"</string>
+    <string name="date_time_12_hour_sample">"13:00"</string>
+    <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"Saati değiştir"</string>
+    <string name="date_time_changeDate_text">"Tarih"</string>
+    <string name="choose_timezone">"Saat dilimini seç"</string>
+    <!-- no translation found for normal_date_format (1982904221918374153) -->
+    <skip />
+    <string name="display_preview_label">"Önizleme:"</string>
+    <string name="display_font_size_label">"Yazı tipi boyutu:"</string>
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text">"<xliff:g id="BROADCAST">broadcast</xliff:g> gönder"</string>
+    <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text">"<xliff:g id="ACTIVITY">activity</xliff:g> işlemini başlat"</string>
+    <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label">"Hesap:"</string>
+    <string name="proxy_clear_text">"Temizle"</string>
+    <string name="proxy_port_label">"Bağlantı Noktası"</string>
+    <string name="proxy_defaultView_text">"Varsayılanları geri yükle"</string>
+    <string name="proxy_action_text">"Kaydet"</string>
+    <string name="proxy_hostname_label">"Ana makine adı"</string>
+    <string name="proxy_error">"Dikkat"</string>
+    <string name="proxy_error_dismiss">"Tamam"</string>
+    <string name="proxy_error_invalid_host">"Yazdığınız ana makine adı geçersiz."</string>
+    <string name="proxy_error_empty_port">"Bağlantı noktası alanını tamamlamalısınız."</string>
+    <string name="proxy_error_empty_host_set_port">"Ana makine alanı boşsa, bağlantı noktası alanı boş olmalıdır."</string>
+    <string name="proxy_error_invalid_port">"Girdiğiniz bağlantı noktası geçersiz."</string>
+    <string name="radio_info_signal_location_label">"Konum:"</string>
+    <string name="radio_info_neighboring_location_label">"Komşu CID:"</string>
+    <string name="radio_info_data_attempts_label">"Veri giriş denemeleri:"</string>
+    <string name="radio_info_gprs_service_label">"GPRS hizmeti:"</string>
+    <string name="radio_info_roaming_label">"Dolaşım:"</string>
+    <string name="radio_info_imei_label">"IMEI:"</string>
+    <string name="radio_info_call_redirect_label">"Çağrı yeniden yönlendir:"</string>
+    <string name="radio_info_ppp_resets_label">"Açılıştan bu yana PPP sıfırlaması sayısı:"</string>
+    <string name="radio_info_gsm_disconnects_label">"GSM bağlantı kesmeleri:"</string>
+    <string name="radio_info_current_network_label">"Geçerli ağ:"</string>
+    <string name="radio_info_data_successes_label">"Veri başarıları:"</string>
+    <string name="radio_info_ppp_received_label">"Alınan PPP:"</string>
+    <string name="radio_info_gsm_service_label">"GSM hizmeti:"</string>
+    <string name="radio_info_signal_strength_label">"Sinyal gücü:"</string>
+    <string name="radio_info_call_status_label">"Çağrı durumu:"</string>
+    <string name="radio_info_ppp_sent_label">"Gönderilen PPP:"</string>
+    <string name="radio_info_radio_resets_label">"Radyo sıfırlamaları:"</string>
+    <string name="radio_info_message_waiting_label">"Mesaj bekliyor:"</string>
+    <string name="radio_info_phone_number_label">"Telefon numarası:"</string>
+    <string name="radio_info_band_mode_label">"Radyo bandını seç"</string>
+    <string name="radio_info_network_type_label">"Ağ türü:"</string>
+    <string name="radio_info_set_perferred_label">"Tercih edilen şebeke türünü ayarla:"</string>
+    <string name="radio_info_ping_ipaddr">"Ping IpAddr:"</string>
+    <string name="radio_info_ping_hostname">"Ping Ana Makine Adı (www.google.com.tr):"</string>
+    <string name="radio_info_http_client_test">"HTTP İstemcisi testi:"</string>
+    <string name="radio_info_toggle_ciph_label">"Şifrelemeyi aç/kapa"</string>
+    <string name="ping_test_label">"Ping testini çalıştır"</string>
+    <string name="radio_info_smsc_label">"SMSC:"</string>
+    <string name="radio_info_smsc_update_label">"Güncelle"</string>
+    <string name="radio_info_smsc_refresh_label">"Yenile"</string>
+    <string name="radio_info_toggle_dns_check_label">"DNS denetimini aç/kapa"</string>
+    <string name="band_mode_title">"GSM/UMTS bandını ayarla"</string>
+    <string name="band_mode_loading">"Bant listesi yükleniyor…"</string>
+    <string name="band_mode_set">"Ayarla"</string>
+    <string name="band_mode_failed">"Başarısız"</string>
+    <string name="band_mode_succeeded">"Başarılı"</string>
+    <string name="sdcard_changes_instructions">"Değişiklikler USB kablosu bağlandığında devreye girer"</string>
+    <string name="sdcard_settings_screen_mass_storage_text">"USB yığın depolamasını etkinleştir"</string>
+    <string name="sdcard_settings_total_bytes_label">"Toplam bayt sayısı:"</string>
+    <string name="sdcard_settings_not_present_status">"SD kart yok"</string>
+    <string name="sdcard_settings_available_bytes_label">"Kullanılabilir bayt:"</string>
+    <string name="sdcard_settings_mass_storage_status">"SD kart, yığın depolama cihazı olarak kullanılıyor"</string>
+    <string name="sdcard_settings_unmounted_status">"SD kart şimdi güvenli olarak çıkarılabilir"</string>
+    <string name="sdcard_settings_bad_removal_status">"SD kart kullanılırken çıkarıldı!"</string>
+    <string name="sdcard_settings_used_bytes_label">"Kullanılan bayt miktarı:"</string>
+    <string name="sdcard_settings_scanning_status">"SD kartta medya aranıyor…"</string>
+    <string name="sdcard_settings_read_only_status">"SD kart salt okunur olarak bağlandı"</string>
+    <string name="next_label">"İleri"</string>
+    <string name="language_picker_title">"Yerel ayar"</string>
+    <string name="select_your_language">"Dilinizi seçin"</string>
+    <string name="activity_picker_label">"Etkinlik seç"</string>
+    <string name="device_info_label">"Cihaz bilgileri"</string>
+    <string name="battery_info_label">"Pil bilgileri"</string>
+    <string name="battery_history_label">"Pil geçmişi"</string>
+    <string name="display_label">"Ekran"</string>
+    <string name="phone_info_label">"Telefon bilgileri"</string>
+    <string name="sd_card_settings_label">"SD kart"</string>
+    <string name="proxy_settings_label">"Proxy ayarları"</string>
+    <string name="cancel">"İptal"</string>
+    <string name="settings_label">"Ayarlar"</string>
+    <!-- no translation found for settings_shortcut (3672145147925639262) -->
+    <skip />
+    <string name="airplane_mode">"Uçak modu"</string>
+    <string name="airplane_mode_summary">"Tüm kablosuz bağlantıları devre dışı bırak"</string>
+    <string name="airplane_mode_turning_on">"Kablosuz bağlantılar devre dışı bırakılıyor…"</string>
+    <string name="airplane_mode_turning_off">"Kablosuz bağlantılar etkinleştiriliyor…"</string>
+    <string name="radio_controls_title">"Kablosuz denetimler"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
+    <string name="date_and_time_settings_title">"Tarih ve saat"</string>
+    <string name="date_and_time_settings_summary">"Tarihi, saati, saat dilimini ve biçimleri ayarla"</string>
+    <string name="date_time_auto">"Otomatik"</string>
+    <string name="date_time_auto_summaryOn">"Ağın sağladığı değerleri kullan"</string>
+    <string name="date_time_auto_summaryOff">"Ağın sağladığı değerleri kullan"</string>
+    <string name="date_time_24hour">"24 saat biçimini kullan"</string>
+    <string name="date_time_set_time">"Saati ayarla"</string>
+    <string name="date_time_set_timezone">"Saat dilimini seç"</string>
+    <string name="date_time_set_date">"Tarihi ayarla"</string>
+    <string name="date_time_date_format">"Tarih biçimini seç"</string>
+    <string name="zone_list_menu_sort_alphabetically">"Alfabetik olarak sırala"</string>
+    <string name="zone_list_menu_sort_by_timezone">"Saat dilimine göre sırala"</string>
+    <string name="security_settings_title">"Güvenlik ve konum"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
+    <string name="security_passwords_title">"Şifreler"</string>
+    <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_summary">"Bluetooth\'u aç"</string>
+    <string name="bluetooth_settings">"Bluetooth ayarları"</string>
+    <string name="bluetooth_settings_title">"Bluetooth ayarları"</string>
+    <string name="bluetooth_settings_summary">"Bağlantıları yönet, cihaz adını gir ve keşfedilebilirlik ayarını yap"</string>
+    <string name="bluetooth_pin_entry">"Bluetooth eşleşme isteği"</string>
+    <string name="bluetooth_device_info">"Bluetooth cihaz bilgileri"</string>
+    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Eşleşmek için PIN kodunu yazın."\n"(0000 ve 1234\'ü deneyin.)"</string>
+    <string name="bluetooth_error_title">"Dikkat"</string>
+    <string name="bluetooth_pairing_error_message">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleşmede bir sorun oluştu."</string>
+    <string name="bluetooth_pairing_pin_error_message">"Yazılan PIN kodu yanlış olduğundan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleşmede bir sorun oldu."</string>
+    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
+    <skip />
+    <string name="bluetooth_connecting_error_message">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> noktasına bağlanırken bir sorun oluştu."</string>
+    <string name="bluetooth_preference_scan_title">"Cihazları tara"</string>
+    <string name="bluetooth_device_context_connect">"Bağlan"</string>
+    <string name="bluetooth_device_context_disconnect">"Bağlantıyı kes"</string>
+    <string name="bluetooth_device_context_pair_connect">"Eşleştir ve bağlan"</string>
+    <string name="bluetooth_device_context_unpair">"Eşleşmeyi bitir"</string>
+    <string name="bluetooth_device_context_disconnect_unpair">"Bağlantıyı kes ve eşleşmeyi bitir"</string>
+    <string name="bluetooth_device_context_connect_advanced">"Seçenekler…"</string>
+    <string name="bluetooth_connect_specific_profiles_title">"Bağlan…"</string>
+    <string name="bluetooth_profile_a2dp">"Medya"</string>
+    <string name="bluetooth_profile_headset">"Telefon"</string>
+    <string name="bluetooth_summary_connected_to_a2dp">"Medya sesine bağlanıldı"</string>
+    <string name="bluetooth_summary_connected_to_headset">"Telefon sesine bağlandı"</string>
+    <string name="bluetooth_summary_connected_to_a2dp_headset">"Telefon ve medya sesine bağlandı"</string>
+    <string name="bluetooth_device_advanced_title">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> seçenek"</string>
+    <string name="bluetooth_device_advanced_online_mode_title">"Bağlan"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary">"Bluetooth cihazına bağlan"</string>
+    <string name="bluetooth_device_advanced_profile_header_title">"Profiller"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected">"Medya sesine bağlanıldı"</string>
+    <string name="bluetooth_headset_profile_summary_connected">"Telefon sesine bağlandı"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for">"Medya sesi için kullan"</string>
+    <string name="bluetooth_headset_profile_summary_use_for">"Telefon sesi için kullan"</string>
+    <string name="wifi">"Kablosuz"</string>
+    <string name="wifi_quick_toggle_title">"Kablosuz"</string>
+    <string name="wifi_quick_toggle_summary">"Kablosuzu aç"</string>
+    <string name="wifi_settings">"Kablosuz ayarları"</string>
+    <string name="wifi_settings_category">"Kablosuz ayarları"</string>
+    <string name="wifi_settings_summary">"Kablosuz erişim noktalarını kur ve yönet"</string>
+    <string name="forget_network">"Unut"</string>
+    <string name="wifi_status">"Durum"</string>
+    <string name="wifi_link_speed">"Hız"</string>
+    <string name="wifi_signal_3">"Mükemmel"</string>
+    <string name="wifi_signal_2">"İyi"</string>
+    <string name="wifi_signal_1">"Yeterli"</string>
+    <string name="wifi_signal_0">"Yetersiz"</string>
+    <string name="security">"Güvenlik"</string>
+    <string name="wifi_security_open">"Aç"</string>
+    <string name="wifi_security_wep">"WEP"</string>
+    <string name="wifi_security_wpa">"WPA"</string>
+    <string name="wifi_security_wpa2">"WPA2"</string>
+    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
+    <skip />
+    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
+    <skip />
+    <string name="wifi_security_unknown">"Bilinmiyor"</string>
+    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
+    <skip />
+    <string name="ip_address">"IP adresi"</string>
+    <string name="signal">"Sinyal gücü"</string>
+    <string name="wifi_starting">"Açılıyor…"</string>
+    <string name="wifi_stopping">"Kapatılıyor…"</string>
+    <string name="wifi_error">"Hata"</string>
+    <string name="error_starting">"Kablosuz başlatılamıyor"</string>
+    <string name="error_stopping">"Kablosuz durdurulamıyor"</string>
+    <string name="error_scanning">"Ağ aranamıyor"</string>
+    <string name="error_connecting">"Ağa bağlanılamıyor"</string>
+    <string name="error_saving">"Ağ kaydedilemiyor"</string>
+    <string name="connect">"Bağlan"</string>
+    <string name="connect_to_blank">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağına bağlan"</string>
+    <!-- no translation found for please_select_eap (4488240331626456338) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for please_type_identity (7061261155499513089) -->
+    <skip />
+    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
+    <skip />
+    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
+    <skip />
+    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
+    <skip />
+    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
+    <skip />
+    <string name="please_type_passphrase">"Kablosuz şifresi"</string>
+    <string name="please_type_hex_key">"Onaltılık WEP anahtarı (0-9, A-F)"</string>
+    <string name="wifi_show_password">"Şifreyi göster."</string>
+    <string name="scan_wifi">"Tara"</string>
+    <string name="summary_not_in_range">"Menzil dışında"</string>
+    <!-- no translation found for summary_remembered (6079941090549401742) -->
+    <skip />
+    <string name="summary_connection_failed">"Bağlantı kurulamadı, yeniden denemek için seçin"</string>
+    <string name="wifi_access_points">"Kablosuz ağlar"</string>
+    <string name="wifi_type_ssid">"Ağ SSID\'si"</string>
+    <string name="wifi_security">"Güvenlik"</string>
+    <string name="wifi_save_config">"Kaydet"</string>
+    <string name="wifi_password_unchanged">"(değişmedi)"</string>
+    <string name="wifi_add_other_network">"Kablosuz ağ ekle"</string>
+    <string name="wifi_notify_open_networks">"Ağ bildirimi"</string>
+    <string name="wifi_notify_open_networks_summary">"Açık bir ağ kullanılabilir olduğunda bana bildir"</string>
+    <string name="wifi_password_incorrect_error">"Yazdığınız ağ şifresi doğru değil. Lütfen yeniden deneyin."</string>
+    <string name="wifi_generic_connection_error">"Ağa bağlanırken bir sorun oluştu. Lütfen yeniden deneyin."</string>
+    <string name="wifi_menu_advanced">"Gelişmiş"</string>
+    <string name="wifi_ip_settings_titlebar">"IP ayarları"</string>
+    <string name="wifi_ip_settings_menu_save">"Kaydet"</string>
+    <string name="wifi_ip_settings_menu_cancel">"İptal"</string>
+    <string name="wifi_ip_settings_invalid_ip">"Lütfen geçerli bir IP adresi yazın."</string>
+    <string name="wifi_use_static_ip">"Statik IP kullan"</string>
+    <string name="wifi_ip_address">"IP adresi"</string>
+    <string name="wifi_dns1">"DNS 1"</string>
+    <string name="wifi_dns2">"DNS 2"</string>
+    <string name="wifi_gateway">"Geçit"</string>
+    <string name="wifi_netmask">"Ağ maskesi"</string>
+    <string name="wifi_context_menu_connect">"Şebekeye bağlan"</string>
+    <string name="wifi_context_menu_forget">"Ağı unut"</string>
+    <string name="wifi_context_menu_change_password">"Şifreyi değiştir"</string>
+    <string name="wifi_advanced_titlebar">"Gelişmiş"</string>
+    <string name="wifi_setting_num_channels_title">"Denetleme alan adı"</string>
+    <string name="wifi_setting_num_channels_summary">"Kullanılacak kanal sayısını ayarla"</string>
+    <string name="wifi_setting_num_channels_error">"Denetleme alanı ayarlanırken bir sorun oldu."</string>
+    <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanal"</string>
+    <string name="wifi_setting_sleep_policy_title">"Kablosuz uyku politikası"</string>
+    <string name="wifi_setting_sleep_policy_summary">"Kablosuzdan mobil veriye geçme zamanını belirt"</string>
+    <string name="wifi_setting_sleep_policy_error">"Uyku politikası ayarlanırken bir sorun oluştu."</string>
+    <string name="wifi_advanced_mac_address_title">"MAC adresi"</string>
+    <string name="fragment_status_scanning">"Taranıyor…"</string>
+    <string name="fragment_status_connecting">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağına bağlanılıyor…"</string>
+    <string name="fragment_status_authenticating">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> üzerinde kimlik doğrulanıyor…"</string>
+    <string name="fragment_status_obtaining_ip">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağından IP adresi alınıyor…"</string>
+    <string name="fragment_status_connected">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağına bağlandı"</string>
+    <string name="fragment_status_disconnecting">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> bağlantısı kesiliyor…"</string>
+    <string name="fragment_status_disconnected">"Bağlantı kesildi"</string>
+    <string name="fragment_status_failed">"Başarısız"</string>
+    <string name="status_scanning">"Taranıyor…"</string>
+    <string name="status_connecting">"Bağlanıyor…"</string>
+    <string name="status_authenticating">"Kimlik doğrulanıyor…"</string>
+    <string name="status_obtaining_ip">"Adres alınıyor…"</string>
+    <string name="status_connected">"Bağlandı"</string>
+    <string name="status_disconnecting">"Bağlantı kesiliyor…"</string>
+    <string name="status_disconnected">"Bağlantı kesildi"</string>
+    <string name="status_failed">"Başarısız"</string>
+    <string name="sound_and_display_settings">"Ses ve görüntü"</string>
+    <string name="sound_settings">"Ses ayarları"</string>
+    <string name="sound_and_display_settings_summary">"Zil seslerini, bildirimleri, ekran parlaklığını ayarla"</string>
+    <string name="silent_mode_title">"Sessiz mod"</string>
+    <string name="silent_mode_summary">"Medya ve alarmlar dışında tüm sesleri susturulur"</string>
+    <string name="silent_mode_incl_alarm_summary">"Medya dışında tüm sesler susturulur"</string>
+    <string name="ringtone_title">"Telefon zil sesi"</string>
+    <string name="ringtone_summary">"Varsayılan gelen çağrı zil sesinizi ayarlayın"</string>
+    <string name="ring_volume_title">"Zil sesi düzeyi"</string>
+    <string name="ring_volume_summary">"Gelen çağrı ve bildirimler için ses düzeyini ayarla"</string>
+    <string name="vibrate_title">"Telefon titreşimi"</string>
+    <string name="vibrate_summary">"Gelen çağrılarda telefonu titreştir"</string>
+    <string name="notification_sound_title">"Bildirim zil sesi"</string>
+    <string name="notification_sound_summary">"Varsayılan bildirim zil sesinizi ayarlayın"</string>
+    <string name="incoming_call_volume_title">"Gelen çağrı ses düzeyi"</string>
+    <string name="notification_volume_title">"Bildirim ses düzeyi"</string>
+    <string name="checkbox_notification_same_as_incoming_call">"Bildirimlerde gelen çağrı ses düzeyini kullan"</string>
+    <string name="notification_sound_dialog_title">"Bildirim zil sesini seç"</string>
+    <string name="media_volume_title">"Medya ses düzeyi"</string>
+    <string name="media_volume_summary">"Müziğin ve videoların ses düzeyini ayarla"</string>
+    <string name="dtmf_tone_enable_title">"Duyulabilir dokunma tonları"</string>
+    <string name="dtmf_tone_enable_summary_on">"Tuş takımını kullanırken ton çal"</string>
+    <string name="dtmf_tone_enable_summary_off">"Tuş takımını kullanırken ton çal"</string>
+    <string name="sound_effects_enable_title">"Duyulabilir seçim"</string>
+    <string name="sound_effects_enable_summary_on">"Ekran seçimi yaparken ses çal"</string>
+    <string name="sound_effects_enable_summary_off">"Ekran seçimi yaparken ses çal"</string>
+    <string name="play_media_notification_sounds_enable_title">"SD kart bildirimleri"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
+    <skip />
+    <string name="sync_settings">"Veri senkronizasyonu"</string>
+    <string name="sync_settings_summary">"Senkronize edilecek uygulamaları seç"</string>
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
+    <string name="display_settings">"Ekran ayarları"</string>
+    <string name="animations_title">"Animasyon"</string>
+    <string name="animations_summary_on">"Pencereleri açıp kapatırken animasyon kullan"</string>
+    <string name="animations_summary_off">"Pencereleri açıp kapatırken animasyon kullan"</string>
+    <string name="accelerometer_title">"Yön"</string>
+    <string name="accelerometer_summary_on">"Telefonu döndürürken yönü otomatik değiştir"</string>
+    <string name="accelerometer_summary_off">"Telefonu döndürürken yönü otomatik değiştir"</string>
+    <string name="brightness">"Parlaklık"</string>
+    <string name="brightness_summary">"Ekranın parlaklığını ayarla"</string>
+    <string name="screen_timeout">"Ekran zaman aşımı"</string>
+    <string name="screen_timeout_summary">"Ekran otomatik olarak kapanmadan önceki gecikmeyi ayarla"</string>
+    <string name="sim_lock_settings">"SIM kart kilit ayarları"</string>
+    <string name="sim_lock_settings_category">"SIM kart kilidini ayarla"</string>
+    <string name="sim_lock_settings_title">"SIM kart kilidi"</string>
+    <string name="sim_pin_toggle">"SIM kartı kilitle"</string>
+    <string name="sim_lock_on">"Telefonu kullanmak için PIN iste"</string>
+    <string name="sim_lock_off">"Telefonu kullanmak için PIN iste"</string>
+    <string name="sim_pin_change">"SIM PIN kodunu değiştir"</string>
+    <string name="sim_enter_pin">"SIM PIN kodu"</string>
+    <string name="sim_enable_sim_lock">"SIM kartı kilitle"</string>
+    <string name="sim_disable_sim_lock">"SIM kart kilidini aç"</string>
+    <string name="sim_enter_old">"Eski SIM PIN kodu"</string>
+    <string name="sim_enter_new">"Yeni SIM PIN kodu"</string>
+    <string name="sim_reenter_new">"Yeni PIN kodunu yeniden yaz"</string>
+    <string name="sim_change_pin">"SIM PIN kodu"</string>
+    <string name="sim_bad_pin">"Yanlış PIN!"</string>
+    <string name="sim_pins_dont_match">"PIN kodları uyuşmuyor!"</string>
+    <string name="sim_change_failed">"PIN kodu değiştirilemiyor."\n"PIN yanlış olabilir."</string>
+    <string name="sim_change_succeeded">"SIM PIN kodu başarıyla değiştirildi"</string>
+    <string name="sim_lock_failed">"SIM kart kilit durumu değiştirilemiyor."\n"PIN kodu yanlış olabilir."</string>
+    <string name="sim_enter_ok">"Tamam"</string>
+    <string name="sim_enter_cancel">"İptal"</string>
+    <string name="device_info_settings">"Telefon durumu"</string>
+    <string name="system_update_settings_list_item_title">"Sistem güncellemeleri"</string>
+    <string name="system_update_settings_list_item_summary">"Sistem güncellemelerini denetle"</string>
+    <string name="firmware_version">"Bellenim sürümü"</string>
+    <string name="model_number">"Model numarası"</string>
+    <string name="baseband_version">"Ana bant sürümü"</string>
+    <string name="kernel_version">"Çekirdek sürümü"</string>
+    <string name="build_number">"Derleme numarası"</string>
+    <string name="device_info_not_available">"Uygun değil"</string>
+    <string name="device_status_activity_title">"Durum"</string>
+    <string name="device_status">"Durum"</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
+    <string name="storage_settings_title">"SD kart ve telefon depolama alanı"</string>
+    <string name="storage_settings_summary">"SD kartın bağlantısını kes, kullanılabilir depolama alanını görüntüle"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
+    <string name="status_network_type">"Mobil ağ türü"</string>
+    <string name="status_data_state">"Mobil ağ durumu"</string>
+    <string name="status_service_state">"Hizmet durumu"</string>
+    <string name="status_signal_strength">"Sinyal gücü"</string>
+    <string name="status_roaming">"Dolaşım"</string>
+    <string name="status_operator">"Ağ"</string>
+    <string name="status_wifi_mac_address">"Kablosuz MAC adresi"</string>
+    <string name="status_bt_address">"Bluetooth adresi"</string>
+    <string name="status_unavailable">"Kullanılamıyor"</string>
+    <string name="status_up_time">"Açık kalma süresi"</string>
+    <string name="status_awake_time">"Uyanık geçen süre"</string>
+    <string name="internal_memory">"Dahili telefon depolama alanı"</string>
+    <string name="sd_memory">"SD kart"</string>
+    <string name="memory_available">"Kullanılabilir alan"</string>
+    <string name="memory_size">"Toplam alan"</string>
+    <string name="sd_eject">"SD kartının bağlantısını kes"</string>
+    <string name="sd_eject_summary">"SD kartı güvenle çıkarmak için bağlantısını kesin"</string>
+    <string name="sd_format">"SD kartı biçimlendir"</string>
+    <string name="sd_format_summary">"SD kartı biçimlendir (sil)"</string>
+    <string name="sd_unavailable">"Kullanılamıyor"</string>
+    <string name="read_only">" (Salt okunur)"</string>
+    <string name="battery_status_title">"Pil durumu"</string>
+    <string name="battery_level_title">"Pil düzeyi"</string>
+    <string name="apn_settings">"APN\'ler"</string>
+    <string name="apn_edit">"Erişim noktasını düzenle"</string>
+    <string name="apn_not_set">"&lt;Ayarlanmadı&gt;"</string>
+    <string name="apn_name">"Ad"</string>
+    <string name="apn_apn">"APN"</string>
+    <string name="apn_http_proxy">"Proxy"</string>
+    <string name="apn_http_port">"Bağlantı Noktası"</string>
+    <string name="apn_user">"Kullanıcı adı"</string>
+    <string name="apn_password">"Şifre"</string>
+    <string name="apn_server">"Sunucu"</string>
+    <string name="apn_mmsc">"MMSC"</string>
+    <string name="apn_mms_proxy">"MMS proxy\'si"</string>
+    <string name="apn_mms_port">"MMS bağlantı noktası"</string>
+    <string name="apn_mcc">"MCC"</string>
+    <string name="apn_mnc">"MNC"</string>
+    <string name="apn_type">"APN türü"</string>
+    <string name="menu_delete">"APN\'yi sil"</string>
+    <string name="menu_new">"Yeni APN"</string>
+    <string name="menu_save">"Kaydet"</string>
+    <string name="menu_cancel">"Sil"</string>
+    <string name="error_title">"Dikkat"</string>
+    <string name="error_name_empty">"Ad alanı boş olamaz."</string>
+    <string name="error_apn_empty">"APN boş olamaz."</string>
+    <string name="error_mcc_not3">"MCC alanında 3 rakam olmalıdır."</string>
+    <string name="error_mnc_not23">"MNC alanı 2 veya 3 rakam olmalıdır."</string>
+    <string name="restore_default_apn">"Varsayılan APN ayarlarını geri yükle"</string>
+    <string name="menu_restore">"Varsayılana sıfırla"</string>
+    <string name="restore_default_apn_completed">"Varsayılan APN ayarlarını sıfırlama tamamlandı"</string>
+    <string name="master_clear_title">"Fabrika verilerine sıfırla"</string>
+    <string name="master_clear_summary">"Telefondaki tüm verileri siler"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
+    <string name="master_clear_button_text">"Telefonu sıfırla"</string>
+    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
+    <skip />
+    <string name="master_clear_final_button_text">"Her şeyi sil"</string>
+    <string name="master_clear_gesture_prompt">"Kilit açma deseninizi çizin"</string>
+    <string name="master_clear_gesture_explanation">"Telefon sıfırlamayı onaylamak için kilit açma deseninizi çizmelisiniz."</string>
+    <string name="master_clear_failed">"Sistem Temizleme hizmeti kullanılamadığından sıfırlama yapılmadı."</string>
+    <string name="media_format_title">"SD kartı biçimlendir."</string>
+    <string name="media_format_summary">"SD karttaki tüm verileri siler"</string>
+    <string name="media_format_desc">"Bu işlem telefondaki SD kartı siler. Karttaki TÜM verileri kaybedersiniz!"</string>
+    <string name="media_format_button_text">"SD kartı biçimlendir"</string>
+    <string name="media_format_final_desc">"SD kartı, üzerindeki tüm medya verileriniz silinerek biçimlendirilsin mi? İşlem geri alınamaz!"</string>
+    <string name="media_format_final_button_text">"Her şeyi sil"</string>
+    <string name="media_format_gesture_prompt">"Kilit açma deseninizi çizin"</string>
+    <string name="media_format_gesture_explanation">"Bir SD kart biçimini onaylamak için kilit açma deseninizi çizmelisiniz."</string>
+    <string name="call_settings_title">"Çağrı ayarları"</string>
+    <string name="call_settings_summary">"Sesli mesajları, çağrı yönlendirmeyi, çağrı bekletmeyi, arayan kimliğini ayarla"</string>
+    <string name="network_settings_title">"Mobil ağlar"</string>
+    <string name="network_settings_summary">"Dolaşım, şebeke, APN seçeneklerini ayarla"</string>
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
+    <string name="location_network_based">"Kablosuz ağ kullan"</string>
+    <string name="location_networks_disabled">"Konumu, kablosuz ağlar kullanan (Google Haritalar gibi) uygulamalarda gör"</string>
+    <string name="location_neighborhood_level">"Konum kablosuz ve/veya cep telefonu ağları tarafından belirlenir"</string>
+    <string name="location_gps">"GPS uydularını etkinleştir"</string>
+    <string name="location_street_level">"Yer bulunurken sokak düzeyinde kesinlik (pilden tasarruf etmek için seçimi kaldırın)"</string>
+    <string name="location_gps_disabled">"Sokak düzeyinde yer bul (daha fazla pil ve gökyüzü görünümü gerektirir)"</string>
+    <!-- no translation found for use_location_title (7585990952633568732) -->
+    <skip />
+    <!-- no translation found for use_location_summary (4411467143899877395) -->
+    <skip />
+    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
+    <skip />
+    <string name="agree">"Kabul ediyorum"</string>
+    <string name="disagree">"Kabul etmiyorum"</string>
+    <string name="about_settings">"Telefon hakkında"</string>
+    <string name="about_settings_summary">"Yasal bilgileri, telefon durumunu, yazılım sürümünü görüntüle"</string>
+    <string name="legal_information">"Yasal bilgiler"</string>
+    <string name="contributors_title">"Katkıda bulunanlar"</string>
+    <string name="copyright_title">"Telif Hakkı"</string>
+    <string name="license_title">"Lisans"</string>
+    <string name="terms_title">"Şartlar ve koşullar"</string>
+    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
+    <skip />
+    <string name="system_tutorial_list_item_summary">"Telefonunuzu nasıl kullanacağınızı öğrenin"</string>
+    <string name="settings_license_activity_title">"Açık kaynak lisansları"</string>
+    <string name="settings_license_activity_unavailable">"Lisanslar yüklenirken bir sorun oluştu."</string>
+    <string name="settings_license_activity_loading">"Yükleniyor…"</string>
+    <string name="lock_settings_title">"Ekran kilidi açma deseni"</string>
+    <string name="lockpattern_change_lock_pattern_label">"Kilit açma desenini değiştir"</string>
+    <string name="lockpattern_need_to_unlock">"Kaydedilen deseni onayla"</string>
+    <string name="lockpattern_need_to_unlock_wrong">"Üzgünüz, lütfen yeniden deneyin:"</string>
+    <string name="lockpattern_recording_intro_header">"Kilit açma deseni çiz"</string>
+    <string name="lockpattern_recording_intro_footer">"Yardım için Menü\'ye basın."</string>
+    <string name="lockpattern_recording_inprogress">"Bittiğinde parmağınızı kaldırın."</string>
+    <string name="lockpattern_recording_incorrect_too_short">"En az <xliff:g id="NUMBER">%d</xliff:g> noktayı birleştirin. Yeniden deneyin:"</string>
+    <string name="lockpattern_pattern_entered_header">"Desen kaydedildi!"</string>
+    <string name="lockpattern_need_to_confirm">"Doğrulamak için deseni yeniden çiz:"</string>
+    <string name="lockpattern_pattern_confirmed_header">"Yeni kilit açma deseniniz:"</string>
+    <string name="lockpattern_confirm_button_text">"Onayla"</string>
+    <string name="lockpattern_restart_button_text">"Yeniden çiz"</string>
+    <string name="lockpattern_retry_button_text">"Yeniden dene"</string>
+    <string name="lockpattern_continue_button_text">"Devam"</string>
+    <string name="lockpattern_settings_title">"Kilit açma deseni"</string>
+    <string name="lockpattern_settings_enable_title">"Desen gerektir"</string>
+    <string name="lockpattern_settings_enable_summary">"Ekran kilidini açmak için desen çizmek gerekir"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">"Görünür desen kullan"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"Dokunma ile geri besleme kullan"</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"Kilit açma desenini ayarla"</string>
+    <string name="lockpattern_settings_change_lock_pattern">"Kilit açma desenini değiştir"</string>
+    <string name="lockpattern_settings_help_how_to_record">"Kilit açma deseni çizme yöntemi"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Çok fazla sayıda yanlış deneme yapıldı!"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"<xliff:g id="NUMBER">%d</xliff:g> saniye içinde yeniden deneyin."</string>
+    <string name="skip_button_label">"İptal"</string>
+    <string name="next_button_label">"İleri"</string>
+    <string name="lock_title">"Telefonunuz güvenlik altına alınıyor"</string>
+    <string name="lock_intro_message"><font size="17">"Kişisel bir ekran kilidi açma deseni oluşturarak telefonunuzu yetkisiz kullanımdan koruyun. "\n<font height="17">\n</font><b>"1"</b>"  Bir sonraki ekranda örnek bir desenin çizilişini izleyin. "\n<font height="17">\n</font><b>"2"</b>"  Hazır olduğunuzda, kendi kişisel kilit açma deseninizi çizin. Değişik desenleri deneyebilirsiniz ancak en az dört noktayı birleştirin. "\n<font height="17">\n</font><b>"3"</b>"  Onaylamak için deseninizi yeniden çizin. "\n<font height="17">\n</font><b>"Başlamaya hazır mısınız? \"İleri\"yi seçin"</b>". "\n<font height="3">\n</font>"Telefonunuzu korumasız bırakmak için \"İptal\"i seçin."</font></string>
+    <string name="lock_example_title">"Örnek desen"</string>
+    <string name="lock_example_message">"En az dört noktayı birleştirin."\n" "\n"Kendi deseninizi çizmeye hazır olduğunuzda \"İleri\"yi seçin."</string>
+    <string name="manageapplications_settings_title">"Uygulamaları yönet"</string>
+    <string name="manageapplications_settings_summary">"Yüklü uygulamaları yönet ve kaldır"</string>
+    <string name="applications_settings">"Uygulamalar"</string>
+    <string name="applications_settings_summary">"Uygulamaları yönet, hızlı başlatma kısayolları ayarla"</string>
+    <string name="applications_settings_header">"Uygulama ayarları"</string>
+    <string name="install_applications">"Bilinmeyen kaynaklar"</string>
+    <string name="install_unknown_applications">"Market dışı uygulamaların yüklenmesine izin ver"</string>
+    <string name="install_all_warning">"Telefonunuz ve kişisel verileriniz, bilinmeyen kaynaklardan gelen uygulamaların saldırılarına karşı daha savunmasızdır. Bu uygulamaları kullanmanız sonucunda telefonunuzun başına gelebilecek her tür hasardan ve veri kaybından tarafınızın sorumlu olduğunu kabul edersiniz."</string>
+    <string name="application_info_label">"Uygulama bilgileri"</string>
+    <string name="storage_label">"Depolama"</string>
+    <string name="auto_launch_label">"Varsayılan olarak başlat"</string>
+    <string name="permissions_label">"İzinler"</string>
+    <string name="cache_header_label">"Önbellek"</string>
+    <string name="clear_cache_btn_text">"Önbelleği temizle"</string>
+    <string name="cache_size_label">"Önbellek"</string>
+    <string name="controls_label">"Denetimler"</string>
+    <string name="force_stop">"Durmaya zorla"</string>
+    <string name="total_size_label">"Toplam"</string>
+    <string name="application_size_label">"Uygulama"</string>
+    <string name="data_size_label">"Veri"</string>
+    <string name="uninstall_text">"Kaldır"</string>
+    <string name="clear_user_data_text">"Verileri temizle"</string>
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
+    <string name="auto_launch_enable_text">"Bu uygulamayı bazı işlemler için varsayılan olarak başlatmayı seçtiniz."</string>
+    <string name="auto_launch_disable_text">"Hiçbir varsayılan ayarlanmadı."</string>
+    <string name="clear_activities">"Varsayılanları temizle"</string>
+    <string name="unknown">"Bilinmiyor"</string>
+    <string name="sort_order_alpha">"Sırala"</string>
+    <string name="sort_order_size">"Boyuta göre sırala"</string>
+    <string name="manage_space_text">"Alanı yönet"</string>
+    <string name="filter">"Filtre"</string>
+    <string name="filter_dlg_title">"Filtre seçeneklerini belirle"</string>
+    <string name="filter_apps_all">"Tümü"</string>
+    <string name="filter_apps_third_party">"Üçüncü taraf"</string>
+    <string name="filter_apps_running">"Çalışıyor"</string>
+    <string name="loading">"Yükleniyor…"</string>
+    <string name="recompute_size">"Boyut yeniden hesaplanıyor…"</string>
+    <string name="clear_data_dlg_title">"Sil"</string>
+    <string name="clear_data_dlg_text">"Bu uygulamaya kaydettiğiniz tüm bilgiler kalıcı olarak silinecek."</string>
+    <string name="dlg_ok">"Tamam"</string>
+    <string name="dlg_cancel">"İptal"</string>
+    <string name="app_not_found_dlg_title">"Uygulama bulunamadı"</string>
+    <string name="app_not_found_dlg_text">"Uygulama yüklü uygulamalar listesinde bulunamadı."</string>
+    <string name="clear_data_failed">"Uygulama verileri silinemiyor."</string>
+    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
+    <skip />
+    <string name="security_settings_desc">"Bu uygulama telefonunuzda aşağıdakilere erişebilir:"</string>
+    <string name="computing_size">"Hesaplanıyor…"</string>
+    <string name="invalid_size_value">"Paket boyutu hesaplanamıyor"</string>
+    <string name="empty_list_msg">"Yüklü üçüncü taraf uygulamanız yok."</string>
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
+    <string name="language_settings">"Yerel ayar ve metin"</string>
+    <string name="language_settings_summary">"Yer (dil ve bölge), metin girişi ve otomatik düzeltme seçeneklerini ayarla"</string>
+    <string name="language_category">"Yerel ayar"</string>
+    <string name="text_category">"Metin ayarları"</string>
+    <string name="phone_language">"Yerel ayarı seç"</string>
+    <string name="phone_language_summary">"Dil ve bölge seç"</string>
+    <string name="auto_replace">"Otomatik değiştirme"</string>
+    <string name="auto_replace_summary">"Yanlış yazılmış kelimeleri düzelt"</string>
+    <string name="auto_caps">"Otomatik büyük harf"</string>
+    <string name="auto_caps_summary">"Cümlelerin ilk harfini büyük yap"</string>
+    <string name="auto_punctuate">"Otomatik noktalama"</string>
+    <string name="hardkeyboard_category">"Fiziksel klavye ayarları"</string>
+    <string name="auto_punctuate_summary">"“.” karakterini girmek için Boşluk tuşuna iki kez basın"</string>
+    <string name="show_password">"Görünür şifreler"</string>
+    <string name="show_password_summary">"Yazarken şifreyi göster"</string>
+    <string name="ime_security_warning">"Bu giriş yöntemi, şifre ve kredi kartı numarası gibi kişisel veriler dahil olmak üzere yazdığınız tüm metni toplayabilir. <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> uygulamasından gelir. Bu giriş yöntemi etkinleştirilsin mi?"</string>
+    <string name="user_dict_settings_titlebar">"Kullanıcı sözlüğü"</string>
+    <string name="user_dict_settings_title">"Kullanıcı sözlüğü"</string>
+    <string name="user_dict_settings_summary">"Kullanıcı sözlüğüne kelime ekleyip sözlükten kelime çıkar"</string>
+    <string name="user_dict_settings_add_menu_title">"Ekle"</string>
+    <string name="user_dict_settings_add_dialog_title">"Sözlüğe ekle"</string>
+    <string name="user_dict_settings_edit_dialog_title">"Kelimeyi düzenle"</string>
+    <string name="user_dict_settings_context_menu_edit_title">"Düzenle"</string>
+    <string name="user_dict_settings_context_menu_delete_title">"Sil"</string>
+    <string name="user_dict_settings_empty_text">"Kullanıcı sözlüğünüzde hiçbir kelime yok. Menüyü kullanarak kelime ekleyebilirsiniz."</string>
+    <string name="testing">"Test ediliyor"</string>
+    <string name="testing_phone_info">"Telefon bilgileri"</string>
+    <string name="testing_battery_info">"Pil bilgileri"</string>
+    <string name="testing_battery_history">"Pil geçmişi"</string>
+    <string name="quick_launch_title">"Hızlı başlat"</string>
+    <string name="quick_launch_summary">"Uygulama başlatma klavye kısayollarını ayarla"</string>
+    <string name="quick_launch_assign_application">"Uygulama ata"</string>
+    <string name="quick_launch_no_shortcut">"Kısayol yok"</string>
+    <string name="quick_launch_shortcut">"Arama + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
+    <string name="quick_launch_clear_dialog_title">"Temizle"</string>
+    <string name="quick_launch_clear_dialog_message">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) için oluşturduğunuz kısayol silinecek."</string>
+    <string name="quick_launch_clear_ok_button">"Tamam"</string>
+    <string name="quick_launch_clear_cancel_button">"İptal"</string>
+    <string name="quick_launch_display_mode_applications">"Uygulamalar"</string>
+    <string name="quick_launch_display_mode_shortcuts">"Kısayollar"</string>
+    <string name="input_methods_settings_title">"Metin girişi"</string>
+    <string name="input_methods_settings_summary">"Metin giriş seçeneklerini yönet"</string>
+    <string name="input_methods_settings_label_format">"<xliff:g id="IME_NAME">%1$s</xliff:g> ayarları"</string>
+    <string name="onscreen_keyboard_settings_summary">"Dokunmatik klavye ayarları"</string>
+    <string name="builtin_keyboard_settings_title">"Cihaz klavyesi"</string>
+    <string name="builtin_keyboard_settings_summary">"Yerleşik klavye ayarları"</string>
+    <string name="development_settings_title">"Geliştirme"</string>
+    <string name="development_settings_summary">"Uygulama geliştirme için seçenekleri ayarla"</string>
+    <string name="enable_adb">"USB hata ayıklaması"</string>
+    <string name="enable_adb_summary">"USB bağlandığında hata ayıklama modu"</string>
+    <string name="keep_screen_on">"Uyanık kal"</string>
+    <string name="keep_screen_on_summary">"Şarj edilirken ekran hiçbir zaman uykuya geçmez"</string>
+    <string name="allow_mock_location">"Sahte konumlara izin ver"</string>
+    <string name="allow_mock_location_summary">"Sahte konumlara izin ver"</string>
+    <!-- no translation found for adb_warning_title (1756027479229533250) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (5352555112049663033) -->
+    <skip />
+    <string name="gadget_picker_title">"Gadget seç"</string>
+    <string name="widget_picker_title">"Widget seç"</string>
+    <string name="battery_history_details_for">"UID %d ayrıntıları"</string>
+    <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
+    <string name="battery_history_network_usage">"<xliff:g id="APP_NAME">%1$s</xliff:g> için ağ kullanım ayrıntıları:"</string>
+    <string name="battery_history_bytes_received">"Alınan bayt: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_sent">"Gönderilen bayt: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_total">"Toplam bayt: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_cpu_usage">"<xliff:g id="APP_NAME">%1$s</xliff:g> için CPU kullanım ayrıntıları:"</string>
+    <string name="battery_history_user_time">"Kullanıcı süresi:"</string>
+    <string name="battery_history_system_time">"Sistem saati:"</string>
+    <string name="battery_history_total_time">"Toplam süre:"</string>
+    <string name="battery_history_starts">"Başlama: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
+    <string name="battery_history_packages_sharing_this_uid">"Bu UID\'yi paylaşan paketler:"</string>
+    <string name="battery_history_no_data">"Pil kullanım verisi yok"</string>
+    <string name="battery_history_sensor">"Algılayıcı:"</string>
+    <string name="battery_history_wakelock">"Kısmi Uyandırma kilidi:"</string>
+    <string name="battery_history_used_by_packages">"Paketlerin kullandığını algılayıcı:"</string>
+    <string name="battery_history_sensor_usage">"<xliff:g id="PACKAGE">%2$s</xliff:g> tarafından <xliff:g id="COUNT">%1$d</xliff:g> kez kullanıldı"</string>
+    <string name="battery_history_sensor_usage_multi">"Şunlardan biri tarafından <xliff:g id="COUNT">%1$d</xliff:g> kez kullanıldı:"</string>
+    <string name="battery_history_awake_label">"Çalışıyor"</string>
+    <string name="battery_history_screen_on_label">"Ekran açık"</string>
+    <string name="battery_history_phone_on_label">"Telefon açık"</string>
+    <string name="battery_history_awake">"Uyku dışında harcanan zaman:"</string>
+    <string name="battery_history_screen_on">"Ekran açıkken harcanan süre:"</string>
+    <string name="battery_history_phone_on">"Telefon açıkken harcanan süre:"</string>
+    <string name="battery_history_screen_on_battery">"Pilde:"</string>
+    <string name="battery_history_screen_on_plugged">"Takıldı:"</string>
+    <string name="usage_stats_label">"Kullanım istatistikleri"</string>
+    <string name="testing_usage_stats">"Kullanım istatistikleri"</string>
+    <string name="display_order_text">"Sıralama ölçütü:"</string>
+    <string name="app_name_label">"Uygulama"</string>
+    <string name="launch_count_label">"Sayım"</string>
+    <string name="usage_time_label">"Kullanım süresi"</string>
+    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
+    <skip />
+    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
+    <skip />
+    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
+    <skip />
+    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (4630925382578609056) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
+    <skip />
+    <!-- no translation found for usage_name_percent (1899151069711662289) -->
+    <skip />
+    <!-- no translation found for details_title (7564809986329021063) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (2353149143338929583) -->
+    <skip />
+    <!-- no translation found for power_wifi (2382791137776486974) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (7052979399415080971) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
+    <skip />
+    <!-- no translation found for battery_action_display (5302763261448580102) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3003604969548979254) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (1834412555123982714) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for tts_settings (6454363854545277027) -->
+    <skip />
+    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (5064947197040356736) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_demo (405357591189935876) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for gadget_title (7455548605888590466) -->
+    <skip />
+    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
+    <skip />
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
+    <skip />
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
+    <skip />
+    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
+    <skip />
+    <!-- no translation found for vpn_no_button (7620339571187119107) -->
+    <skip />
+    <!-- no translation found for vpn_back_button (192036339792734970) -->
+    <skip />
+    <!-- no translation found for vpn_mistake_button (1759404628590603933) -->
+    <skip />
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <!-- no translation found for vpn_connecting (8039521381692090116) -->
+    <skip />
+    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
+    <skip />
+    <!-- no translation found for vpn_connected (7641723116362845781) -->
+    <skip />
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
+</resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 5f3ec45..a26b70c 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -32,28 +32,39 @@
     <item>"10 分钟"</item>
     <item>"从不待机"</item>
   </string-array>
-  <string-array name="wifi_security_entries">
-    <item>"自动"</item>
-    <item>"无"</item>
-    <item>"WEP"</item>
-    <item>"WPA（个人）"</item>
-    <item>"WPA2（个人）"</item>
-  </string-array>
-  <string-array name="wifi_security_without_auto_entries">
-    <item>"无"</item>
-    <item>"WEP"</item>
-    <item>"WPA（个人）"</item>
-    <item>"WPA2（个人）"</item>
-  </string-array>
+    <!-- no translation found for tts_rate_entries:0 (6041212618892492920) -->
+    <!-- no translation found for tts_rate_entries:1 (2361722960903353554) -->
+    <!-- no translation found for tts_rate_entries:2 (1145554631248513562) -->
+    <!-- no translation found for tts_rate_entries:3 (7553665153391107454) -->
+    <!-- no translation found for tts_rate_entries:4 (2538100882620724753) -->
+    <!-- no translation found for tts_pitch_entries:0 (7526050907652687351) -->
+    <!-- no translation found for tts_pitch_entries:1 (2692137425242433765) -->
+    <!-- no translation found for tts_pitch_entries:2 (3332408460740717754) -->
+    <!-- no translation found for tts_pitch_entries:3 (4907380534957572531) -->
+    <!-- no translation found for tts_pitch_entries:4 (4699640516390840297) -->
+    <!-- no translation found for tts_lang_entries:0 (478030717868306353) -->
+    <!-- no translation found for tts_lang_entries:1 (5192284521396794598) -->
+    <!-- no translation found for tts_lang_entries:2 (3000262452051711991) -->
+    <!-- no translation found for tts_lang_entries:3 (9214080387341763401) -->
+    <!-- no translation found for tts_lang_entries:4 (5972100016440094433) -->
+    <!-- no translation found for tts_lang_entries:5 (5811378076054402537) -->
+    <!-- no translation found for wifi_security_entries:3 (6303607119537134095) -->
+    <!-- no translation found for wifi_security_entries:4 (1977424472734732392) -->
+    <!-- no translation found for wifi_security_entries:5 (5185669984217684689) -->
+    <!-- no translation found for wifi_security_entries:6 (8643206823103498303) -->
+    <!-- no translation found for wifi_security_without_auto_entries:2 (2296204649410509235) -->
+    <!-- no translation found for wifi_security_without_auto_entries:3 (8928468573279595315) -->
+    <!-- no translation found for wifi_security_without_auto_entries:4 (8319241197948974314) -->
+    <!-- no translation found for wifi_security_without_auto_entries:5 (2222409752754955757) -->
   <string-array name="wifi_wep_type">
     <item>"自动"</item>
     <item>"WEP ASCII"</item>
     <item>"WEP 十六进制"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item>"当屏幕关闭时"</item>
-    <item>"插入后从不进入休眠状态"</item>
-    <item>"从不"</item>
+    <item>"屏幕关闭时休眠"</item>
+    <item>"充电时永不休眠"</item>
+    <item>"永不休眠"</item>
   </string-array>
   <string-array name="battery_history_type_spinner">
     <item>"CPU 使用率"</item>
@@ -73,4 +84,15 @@
     <item>"启动次数"</item>
     <item>"应用程序名称"</item>
   </string-array>
+    <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
+    <!-- no translation found for wifi_eap_entries:1 (8667872640594311615) -->
+    <!-- no translation found for wifi_eap_entries:2 (7182812872984827322) -->
+    <!-- no translation found for wifi_phase2_entries:0 (1818786254010764570) -->
+    <!-- no translation found for wifi_phase2_entries:1 (6189918678874123056) -->
+    <!-- no translation found for wifi_phase2_entries:2 (1524112260493662517) -->
+    <!-- no translation found for wifi_phase2_entries:3 (1586767102985419413) -->
+    <!-- no translation found for wifi_phase2_entries:4 (8651992560135239389) -->
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1428b85..a990f93 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -19,23 +19,23 @@
     <string name="turn_on_radio">"打开收音机"</string>
     <string name="turn_off_radio">"关闭收音机"</string>
     <string name="turn_on_qxdm">"启用 QXDM SD 日志"</string>
-    <string name="turn_off_qxdm">"禁用 QXDM SD 日志"</string>
+    <string name="turn_off_qxdm">"停用 QXDM SD 日志"</string>
     <string name="radioInfo_menu_viewADN">"查看 SIM 卡地址簿"</string>
-    <string name="radioInfo_menu_viewFDN">"查看固定拨号"</string>
-    <string name="radioInfo_menu_viewSDN">"查看服务拨号"</string>
+    <string name="radioInfo_menu_viewFDN">"查看固定拨号号码"</string>
+    <string name="radioInfo_menu_viewSDN">"查看服务拨号号码"</string>
     <string name="radioInfo_menu_getPDP">"获取 PDP 列表"</string>
     <string name="radioInfo_menu_enableData">"启用数据连接"</string>
-    <string name="radioInfo_menu_disableData">"禁用数据连接"</string>
-    <string name="radioInfo_menu_enableDataOnBoot">"引导时启用数据"</string>
-    <string name="radioInfo_menu_disableDataOnBoot">"引导时禁用数据"</string>
-    <string name="radioInfo_service_in">"在使用中"</string>
+    <string name="radioInfo_menu_disableData">"停用数据连接"</string>
+    <string name="radioInfo_menu_enableDataOnBoot">"启动时启用数据"</string>
+    <string name="radioInfo_menu_disableDataOnBoot">"启动时停用数据"</string>
+    <string name="radioInfo_service_in">"正在使用中"</string>
     <string name="radioInfo_service_out">"不在服务区"</string>
-    <string name="radioInfo_service_emergency">"仅紧急呼叫"</string>
-    <string name="radioInfo_service_off">"收音机已关闭"</string>
+    <string name="radioInfo_service_emergency">"仅限于紧急电话"</string>
+    <string name="radioInfo_service_off">"关闭收音机"</string>
     <string name="radioInfo_roaming_in">"漫游"</string>
-    <string name="radioInfo_roaming_not">"无漫游"</string>
+    <string name="radioInfo_roaming_not">"非漫游"</string>
     <string name="radioInfo_phone_idle">"空闲"</string>
-    <string name="radioInfo_phone_ringing">"正在响铃"</string>
+    <string name="radioInfo_phone_ringing">"响铃"</string>
     <string name="radioInfo_phone_offhook">"正在通话"</string>
     <string name="radioInfo_data_disconnected">"已断开连接"</string>
     <string name="radioInfo_data_connecting">"正在连接"</string>
@@ -56,40 +56,40 @@
     <string name="font_size_save">"确定"</string>
     <string name="sdcard_setting">"SD 卡"</string>
     <string name="battery_info_status_label">"电池状态："</string>
-    <string name="battery_info_scale_label">"电池容量："</string>
-    <string name="battery_info_level_label">"电池级别："</string>
-    <string name="battery_info_health_label">"电池健康状态："</string>
+    <string name="battery_info_scale_label">"电池电量："</string>
+    <string name="battery_info_level_label">"电池电量："</string>
+    <string name="battery_info_health_label">"电池运行状况："</string>
     <string name="battery_info_technology_label">"电池技术："</string>
     <string name="battery_info_voltage_label">"电池电压："</string>
     <string name="battery_info_voltage_units">"mV"</string>
     <string name="battery_info_temperature_label">"电池温度："</string>
     <string name="battery_info_temperature_units">"° C"</string>
-    <string name="battery_info_uptime">"自引导以来的时间："</string>
+    <string name="battery_info_uptime">"启动后的时间："</string>
     <string name="battery_info_awake_battery">"电池的唤醒时间："</string>
     <string name="battery_info_awake_plugged">"充电时的唤醒时间："</string>
     <string name="battery_info_screen_on">"屏幕开启时间："</string>
     <string name="battery_info_status_unknown">"未知"</string>
     <string name="battery_info_status_charging">"正在充电"</string>
-    <string name="battery_info_status_charging_ac">"(AC)"</string>
+    <string name="battery_info_status_charging_ac">"（交流电）"</string>
     <string name="battery_info_status_charging_usb">"(USB)"</string>
     <string name="battery_info_status_discharging">"正在放电"</string>
     <string name="battery_info_status_not_charging">"未在充电"</string>
     <string name="battery_info_status_full">"已满"</string>
     <string name="battery_info_health_unknown">"未知"</string>
-    <string name="battery_info_health_good">"较强"</string>
+    <string name="battery_info_health_good">"正常"</string>
     <string name="battery_info_health_overheat">"过热"</string>
     <string name="battery_info_health_dead">"没电"</string>
     <string name="battery_info_health_over_voltage">"过电压"</string>
     <string name="battery_info_health_unspecified_failure">"未知错误"</string>
     <string name="bluetooth">"蓝牙"</string>
-    <string name="bluetooth_visibility">"可发现"</string>
-    <string name="bluetooth_is_discoverable">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒内可发现..."</string>
-    <string name="bluetooth_not_discoverable">"让设备能被搜索到"</string>
+    <string name="bluetooth_visibility">"可检测到"</string>
+    <string name="bluetooth_is_discoverable">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒内可检测到..."</string>
+    <string name="bluetooth_not_discoverable">"使设备可检测到"</string>
     <string name="bluetooth_devices">"蓝牙设备"</string>
     <string name="bluetooth_device_name">"设备名称"</string>
     <string name="bluetooth_name_not_set">"无名称集，使用帐户名"</string>
-    <string name="bluetooth_scan_for_devices">"扫描以找到设备"</string>
-    <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>会断开连接。"</string>
+    <string name="bluetooth_scan_for_devices">"扫描查找设备"</string>
+    <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将断开连接。"</string>
     <string name="bluetooth_connected">"已连接"</string>
     <string name="bluetooth_disconnected">"已断开连接"</string>
     <string name="bluetooth_disconnecting">"正在断开连接..."</string>
@@ -99,43 +99,47 @@
     <string name="bluetooth_not_connected">"与此设备配对"</string>
     <string name="bluetooth_pairing">"正在配对..."</string>
     <string name="bluetooth_paired">"已配对但未连接"</string>
-    <string name="bluetooth_device">"免持听筒/耳机"</string>
+    <string name="bluetooth_device">"免提/耳机"</string>
     <string name="progress_scanning">"正在扫描"</string>
     <string name="bluetooth_notif_ticker">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title">"配对请求"</string>
-    <string name="bluetooth_notif_message">"选择以与以下对象配对 "</string>
+    <string name="bluetooth_notif_message">"选择要配对的对象 "</string>
     <string name="date_and_time">"日期和时间设置"</string>
     <string name="date_time_12_hour_sample">"下午 1:00"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"更改时间"</string>
+    <string name="date_time_changeDate_text">"日期"</string>
     <string name="choose_timezone">"选择时区"</string>
+    <!-- no translation found for normal_date_format (1982904221918374153) -->
+    <skip />
     <string name="display_preview_label">"预览："</string>
-    <string name="display_font_size_label">"字体大小："</string>
+    <string name="display_font_size_label">"字号："</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"发送<xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>："</string>
-    <string name="intent_sender_startactivity_text">"开始 <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_startactivity_text">"启动<xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>："</string>
     <string name="intent_sender_account_label">"帐户："</string>
     <string name="proxy_clear_text">"清除"</string>
     <string name="proxy_port_label">"端口"</string>
-    <string name="proxy_defaultView_text">"恢复默认值"</string>
+    <string name="proxy_defaultView_text">"恢复默认设置"</string>
     <string name="proxy_action_text">"保存"</string>
     <string name="proxy_hostname_label">"主机名"</string>
     <string name="proxy_error">"注意"</string>
     <string name="proxy_error_dismiss">"确定"</string>
-    <string name="proxy_error_invalid_host">"您键入的主机名无效。"</string>
-    <string name="proxy_error_empty_port">"必须完成端口字段。"</string>
+    <string name="proxy_error_invalid_host">"您输入的主机名无效。"</string>
+    <string name="proxy_error_empty_port">"您必须填写端口字段。"</string>
     <string name="proxy_error_empty_host_set_port">"如果主机字段为空，则端口字段必须为空。"</string>
-    <string name="proxy_error_invalid_port">"您键入的端口无效。"</string>
+    <string name="proxy_error_invalid_port">"您输入的端口无效。"</string>
     <string name="radio_info_signal_location_label">"位置："</string>
     <string name="radio_info_neighboring_location_label">"相邻的 CID："</string>
-    <string name="radio_info_data_attempts_label">"数据尝试："</string>
+    <string name="radio_info_data_attempts_label">"数据尝试次数："</string>
     <string name="radio_info_gprs_service_label">"GPRS 服务："</string>
     <string name="radio_info_roaming_label">"漫游："</string>
     <string name="radio_info_imei_label">"IMEI："</string>
     <string name="radio_info_call_redirect_label">"呼叫重定向："</string>
-    <string name="radio_info_ppp_resets_label">"引导后已重设的 PPP 数："</string>
+    <string name="radio_info_ppp_resets_label">"启动后重置 PPP 的次数："</string>
     <string name="radio_info_gsm_disconnects_label">"GSM 断开连接："</string>
     <string name="radio_info_current_network_label">"当前网络："</string>
     <string name="radio_info_data_successes_label">"数据成功："</string>
@@ -144,17 +148,17 @@
     <string name="radio_info_signal_strength_label">"信号强度："</string>
     <string name="radio_info_call_status_label">"呼叫状态："</string>
     <string name="radio_info_ppp_sent_label">"已发送 PPP："</string>
-    <string name="radio_info_radio_resets_label">"收音机重设："</string>
+    <string name="radio_info_radio_resets_label">"重置收音机："</string>
     <string name="radio_info_message_waiting_label">"消息等待："</string>
-    <string name="radio_info_phone_number_label">"手机号："</string>
+    <string name="radio_info_phone_number_label">"手机号码："</string>
     <string name="radio_info_band_mode_label">"选择收音机波段"</string>
     <string name="radio_info_network_type_label">"网络类型："</string>
-    <string name="radio_info_set_perferred_label">"设置首选的网络类型："</string>
-    <string name="radio_info_ping_ipaddr">"Ping IpAddr："</string>
+    <string name="radio_info_set_perferred_label">"设置首选网络类型："</string>
+    <string name="radio_info_ping_ipaddr">"Ping IP 地址："</string>
     <string name="radio_info_ping_hostname">"Ping 主机名 (www.google.com)："</string>
     <string name="radio_info_http_client_test">"HTTP 客户端测试："</string>
     <string name="radio_info_toggle_ciph_label">"切换加密"</string>
-    <string name="ping_test_label">"进行 Ping 测试"</string>
+    <string name="ping_test_label">"运行 ping 测试"</string>
     <string name="radio_info_smsc_label">"SMSC："</string>
     <string name="radio_info_smsc_update_label">"更新"</string>
     <string name="radio_info_smsc_refresh_label">"刷新"</string>
@@ -164,20 +168,20 @@
     <string name="band_mode_set">"设置"</string>
     <string name="band_mode_failed">"失败"</string>
     <string name="band_mode_succeeded">"成功"</string>
-    <string name="sdcard_changes_instructions">"更改会在重新连接 USB 电缆后生效"</string>
-    <string name="sdcard_settings_screen_mass_storage_text">"启用 USB 大容量存储"</string>
-    <string name="sdcard_settings_total_bytes_label">"字节总数："</string>
+    <string name="sdcard_changes_instructions">"重新连接 USB 线后更改生效"</string>
+    <string name="sdcard_settings_screen_mass_storage_text">"启用 USB 大容量存储模式"</string>
+    <string name="sdcard_settings_total_bytes_label">"总字节数："</string>
     <string name="sdcard_settings_not_present_status">"无 SD 卡"</string>
     <string name="sdcard_settings_available_bytes_label">"可用的字节数："</string>
-    <string name="sdcard_settings_mass_storage_status">"正在将 SD 卡用作大容量存储设备"</string>
-    <string name="sdcard_settings_unmounted_status">"现在可以安全卸下 SD 卡"</string>
-    <string name="sdcard_settings_bad_removal_status">"SD 卡在使用过程中被卸下！"</string>
-    <string name="sdcard_settings_used_bytes_label">"使用的字节数："</string>
-    <string name="sdcard_settings_scanning_status">"正在扫描 SD 卡以获取媒体..."</string>
-    <string name="sdcard_settings_read_only_status">"装载的 SD 卡为只读"</string>
+    <string name="sdcard_settings_mass_storage_status">"SD 卡正用作大容量存储设备"</string>
+    <string name="sdcard_settings_unmounted_status">"现在可以安全地卸下 SD 卡"</string>
+    <string name="sdcard_settings_bad_removal_status">"SD 卡在使用过程中被移除！"</string>
+    <string name="sdcard_settings_used_bytes_label">"已使用的字节数："</string>
+    <string name="sdcard_settings_scanning_status">"正在扫描 SD 卡查找媒体..."</string>
+    <string name="sdcard_settings_read_only_status">"安装的 SD 卡为只读"</string>
     <string name="next_label">"下一步"</string>
-    <string name="language_picker_title">"区域"</string>
-    <string name="select_your_language">"选择语言"</string>
+    <string name="language_picker_title">"语言区域"</string>
+    <string name="select_your_language">"选择您使用的语言"</string>
     <string name="activity_picker_label">"选择活动"</string>
     <string name="device_info_label">"设备信息"</string>
     <string name="battery_info_label">"电池信息"</string>
@@ -188,12 +192,33 @@
     <string name="proxy_settings_label">"代理设置"</string>
     <string name="cancel">"取消"</string>
     <string name="settings_label">"设置"</string>
-    <string name="airplane_mode">"飞航模式"</string>
-    <string name="airplane_mode_summary">"禁用所有无线连接"</string>
-    <string name="airplane_mode_turning_on">"正在禁用无线连接..."</string>
+    <!-- no translation found for settings_shortcut (3672145147925639262) -->
+    <skip />
+    <string name="airplane_mode">"飞行模式"</string>
+    <string name="airplane_mode_summary">"停用所有无线连接"</string>
+    <string name="airplane_mode_turning_on">"正在停用无线连接..."</string>
     <string name="airplane_mode_turning_off">"正在启用无线连接..."</string>
     <string name="radio_controls_title">"无线控件"</string>
-    <string name="radio_controls_summary">"管理 Wi-Fi、蓝牙、飞航模式和移动网络"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
     <string name="date_and_time_settings_title">"日期和时间"</string>
     <string name="date_and_time_settings_summary">"设置日期、时间、时区和格式"</string>
     <string name="date_time_auto">"自动"</string>
@@ -207,39 +232,44 @@
     <string name="zone_list_menu_sort_alphabetically">"按字母顺序排序"</string>
     <string name="zone_list_menu_sort_by_timezone">"按时区排序"</string>
     <string name="security_settings_title">"安全性和位置"</string>
-    <string name="security_settings_summary">"设置我的位置、屏幕解锁、SIM 卡锁定"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"密码"</string>
     <string name="bluetooth_quick_toggle_title">"蓝牙"</string>
     <string name="bluetooth_quick_toggle_summary">"打开蓝牙"</string>
     <string name="bluetooth_settings">"蓝牙设置"</string>
     <string name="bluetooth_settings_title">"蓝牙设置"</string>
-    <string name="bluetooth_settings_summary">"管理连接，设置设备名称和可发现性"</string>
+    <string name="bluetooth_settings_summary">"管理连接，设置设备名称和可检测性"</string>
     <string name="bluetooth_pin_entry">"蓝牙配对请求"</string>
     <string name="bluetooth_device_info">"蓝牙设备信息"</string>
-    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"键入 PIN 码以配对。"\n"（尝试键入 0000 或 1234。）"</string>
+    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"输入 PIN 进行配对。"\n"（尝试一下 0000 或 1234。）"</string>
     <string name="bluetooth_error_title">"注意"</string>
     <string name="bluetooth_pairing_error_message">"与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对时出现问题。"</string>
-    <string name="bluetooth_pairing_pin_error_message">"与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对时出现问题，因为键入的 PIN 码不正确。"</string>
-    <string name="bluetooth_connecting_error_message">"连接至<xliff:g id="DEVICE_NAME">%1$s</xliff:g>时出现问题。"</string>
-    <string name="bluetooth_preference_scan_title">"扫描以找到设备"</string>
+    <string name="bluetooth_pairing_pin_error_message">"与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对时出现问题，因为输入的 PIN 不正确。"</string>
+    <!-- no translation found for bluetooth_pairing_device_down_error_message (6688215193824686741) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_rejected_error_message (1648157108520832454) -->
+    <skip />
+    <string name="bluetooth_connecting_error_message">"连接到<xliff:g id="DEVICE_NAME">%1$s</xliff:g>时出现问题。"</string>
+    <string name="bluetooth_preference_scan_title">"扫描查找设备"</string>
     <string name="bluetooth_device_context_connect">"连接"</string>
     <string name="bluetooth_device_context_disconnect">"断开连接"</string>
     <string name="bluetooth_device_context_pair_connect">"配对和连接"</string>
     <string name="bluetooth_device_context_unpair">"取消配对"</string>
-    <string name="bluetooth_device_context_disconnect_unpair">"断开连接并取消配对"</string>
+    <string name="bluetooth_device_context_disconnect_unpair">"断开连接和取消配对"</string>
     <string name="bluetooth_device_context_connect_advanced">"选项..."</string>
-    <string name="bluetooth_connect_specific_profiles_title">"连接至..."</string>
+    <string name="bluetooth_connect_specific_profiles_title">"连接到..."</string>
     <string name="bluetooth_profile_a2dp">"媒体"</string>
     <string name="bluetooth_profile_headset">"手机"</string>
-    <string name="bluetooth_summary_connected_to_a2dp">"已连接至媒体音频"</string>
-    <string name="bluetooth_summary_connected_to_headset">"已连接至手机音频"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset">"已连接至手机和媒体音频"</string>
+    <string name="bluetooth_summary_connected_to_a2dp">"已连接到媒体音频"</string>
+    <string name="bluetooth_summary_connected_to_headset">"已连接到手机音频"</string>
+    <string name="bluetooth_summary_connected_to_a2dp_headset">"已连接到手机和媒体音频"</string>
     <string name="bluetooth_device_advanced_title">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>选项"</string>
     <string name="bluetooth_device_advanced_online_mode_title">"连接"</string>
-    <string name="bluetooth_device_advanced_online_mode_summary">"连接至蓝牙设备"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary">"连接到蓝牙设备"</string>
     <string name="bluetooth_device_advanced_profile_header_title">"个人资料"</string>
-    <string name="bluetooth_a2dp_profile_summary_connected">"已连接至媒体音频"</string>
-    <string name="bluetooth_headset_profile_summary_connected">"已连接至手机音频"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected">"已连接到媒体音频"</string>
+    <string name="bluetooth_headset_profile_summary_connected">"已连接到手机音频"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for">"用于媒体音频"</string>
     <string name="bluetooth_headset_profile_summary_use_for">"用于手机音频"</string>
     <string name="wifi">"Wi-Fi"</string>
@@ -251,39 +281,66 @@
     <string name="forget_network">"忘记"</string>
     <string name="wifi_status">"状态"</string>
     <string name="wifi_link_speed">"速度"</string>
-    <string name="wifi_signal_3">"极强"</string>
-    <string name="wifi_signal_2">"较强"</string>
-    <string name="wifi_signal_1">"强"</string>
+    <string name="wifi_signal_3">"最强"</string>
+    <string name="wifi_signal_2">"正常"</string>
+    <string name="wifi_signal_1">"较强"</string>
     <string name="wifi_signal_0">"弱"</string>
     <string name="security">"安全性"</string>
-    <string name="wifi_security_open">"开放"</string>
+    <string name="wifi_security_open">"打开"</string>
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <!-- no translation found for wifi_security_wpa_eap (7485687331651751101) -->
+    <skip />
+    <!-- no translation found for wifi_security_ieee8021x (8538687609878109005) -->
+    <skip />
     <string name="wifi_security_unknown">"未知"</string>
-    <string name="wifi_security_verbose_open">"打开网络"</string>
-    <string name="wifi_security_verbose_wep">"用 WEP 保护"</string>
-    <string name="wifi_security_verbose_wpa">"通过 WPA 保护"</string>
-    <string name="wifi_security_verbose_wpa2">"通过 WPA2 保护"</string>
+    <!-- no translation found for wifi_security_verbose_open (8117878112088901945) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wep (9220757688700421508) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa (598697674252714455) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa2 (4116236883347875722) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_wpa_eap (1984821646949066624) -->
+    <skip />
+    <!-- no translation found for wifi_security_verbose_ieee8021x (5552995793910186310) -->
+    <skip />
     <string name="ip_address">"IP 地址"</string>
     <string name="signal">"信号强度"</string>
     <string name="wifi_starting">"正在打开..."</string>
     <string name="wifi_stopping">"正在关闭..."</string>
-    <string name="wifi_error">"错误"</string>
+    <string name="wifi_error">"出错"</string>
     <string name="error_starting">"无法启动 Wi-Fi"</string>
     <string name="error_stopping">"无法停止 Wi-Fi"</string>
-    <string name="error_scanning">"无法扫描以找到网络"</string>
-    <string name="error_connecting">"无法连接至网络"</string>
+    <string name="error_scanning">"无法扫描查找网络"</string>
+    <string name="error_connecting">"无法连接到网络"</string>
     <string name="error_saving">"无法保存网络"</string>
     <string name="connect">"连接"</string>
-    <string name="connect_to_blank">"连接至 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_to_blank">"连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for please_select_eap (4488240331626456338) -->
+    <skip />
+    <!-- no translation found for please_select_phase2 (5231074529772044898) -->
+    <skip />
+    <!-- no translation found for please_type_identity (7061261155499513089) -->
+    <skip />
+    <!-- no translation found for please_type_anonymous_identity (835061562079965048) -->
+    <skip />
+    <!-- no translation found for please_select_client_certificate (2137906961594663234) -->
+    <skip />
+    <!-- no translation found for please_select_ca_certificate (5010815181914420677) -->
+    <skip />
+    <!-- no translation found for please_type_private_key_passwd (4077744679722504443) -->
+    <skip />
     <string name="please_type_passphrase">"无线密码"</string>
     <string name="please_type_hex_key">"WEP 十六进制键（0-9、A-F）"</string>
     <string name="wifi_show_password">"显示密码。"</string>
     <string name="scan_wifi">"扫描"</string>
-    <string name="summary_not_in_range">"不在范围之内"</string>
-    <string name="summary_remembered">"已记忆"</string>
-    <string name="summary_connection_failed">"连接失败，请选择以重试"</string>
+    <string name="summary_not_in_range">"不在范围内"</string>
+    <!-- no translation found for summary_remembered (6079941090549401742) -->
+    <skip />
+    <string name="summary_connection_failed">"连接失败，请选择重试"</string>
     <string name="wifi_access_points">"Wi-Fi 网络"</string>
     <string name="wifi_type_ssid">"网络 SSID"</string>
     <string name="wifi_security">"安全性"</string>
@@ -291,43 +348,43 @@
     <string name="wifi_password_unchanged">"（未更改）"</string>
     <string name="wifi_add_other_network">"添加 Wi-Fi 网络"</string>
     <string name="wifi_notify_open_networks">"网络通知"</string>
-    <string name="wifi_notify_open_networks_summary">"当有开放网络可用时通知我"</string>
-    <string name="wifi_password_incorrect_error">"您键入的网络密码不正确。请重试。"</string>
-    <string name="wifi_generic_connection_error">"连接至网络时出现问题。请重试。"</string>
+    <string name="wifi_notify_open_networks_summary">"开放网络可用时通知我"</string>
+    <string name="wifi_password_incorrect_error">"您输入的网络密码不正确，请重试。"</string>
+    <string name="wifi_generic_connection_error">"连接网络时出现问题，请重试。"</string>
     <string name="wifi_menu_advanced">"高级"</string>
     <string name="wifi_ip_settings_titlebar">"IP 设置"</string>
     <string name="wifi_ip_settings_menu_save">"保存"</string>
     <string name="wifi_ip_settings_menu_cancel">"取消"</string>
-    <string name="wifi_ip_settings_invalid_ip">"请键入有效的 IP 地址。"</string>
+    <string name="wifi_ip_settings_invalid_ip">"请输入有效的 IP 地址。"</string>
     <string name="wifi_use_static_ip">"使用静态 IP"</string>
     <string name="wifi_ip_address">"IP 地址"</string>
-    <string name="wifi_dns1">"DNS 1"</string>
-    <string name="wifi_dns2">"DNS 2"</string>
+    <string name="wifi_dns1">"域名 1"</string>
+    <string name="wifi_dns2">"域名 2"</string>
     <string name="wifi_gateway">"网关"</string>
     <string name="wifi_netmask">"网络掩码"</string>
-    <string name="wifi_context_menu_connect">"连接至网络"</string>
+    <string name="wifi_context_menu_connect">"连接到网络"</string>
     <string name="wifi_context_menu_forget">"忘记网络"</string>
     <string name="wifi_context_menu_change_password">"更改密码"</string>
     <string name="wifi_advanced_titlebar">"高级"</string>
-    <string name="wifi_setting_num_channels_title">"调节域"</string>
-    <string name="wifi_setting_num_channels_summary">"设置要使用的频道数"</string>
-    <string name="wifi_setting_num_channels_error">"设置调节域时出现问题。"</string>
+    <string name="wifi_setting_num_channels_title">"调整域"</string>
+    <string name="wifi_setting_num_channels_summary">"设置要使用的频道个数"</string>
+    <string name="wifi_setting_num_channels_error">"设置调整域时出现问题。"</string>
     <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> 个频道"</string>
     <string name="wifi_setting_sleep_policy_title">"Wi-Fi 休眠策略"</string>
     <string name="wifi_setting_sleep_policy_summary">"指定何时从 Wi-Fi 切换到手机数据"</string>
     <string name="wifi_setting_sleep_policy_error">"设置休眠策略时出现问题。"</string>
     <string name="wifi_advanced_mac_address_title">"MAC 地址"</string>
     <string name="fragment_status_scanning">"正在扫描..."</string>
-    <string name="fragment_status_connecting">"正在连接至 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
-    <string name="fragment_status_authenticating">"正在通过 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 验证..."</string>
+    <string name="fragment_status_connecting">"正在连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
+    <string name="fragment_status_authenticating">"正在通过 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 进行身份验证..."</string>
     <string name="fragment_status_obtaining_ip">"正在从 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 获取 IP 地址..."</string>
-    <string name="fragment_status_connected">"已连接至 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="fragment_status_connected">"已连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="fragment_status_disconnecting">"正在断开与 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的连接..."</string>
     <string name="fragment_status_disconnected">"已断开连接"</string>
     <string name="fragment_status_failed">"失败"</string>
     <string name="status_scanning">"正在扫描..."</string>
     <string name="status_connecting">"正在连接..."</string>
-    <string name="status_authenticating">"正在验证..."</string>
+    <string name="status_authenticating">"正在进行身份验证..."</string>
     <string name="status_obtaining_ip">"正在获取地址..."</string>
     <string name="status_connected">"已连接"</string>
     <string name="status_disconnecting">"正在断开连接..."</string>
@@ -335,83 +392,96 @@
     <string name="status_failed">"失败"</string>
     <string name="sound_and_display_settings">"声音和显示"</string>
     <string name="sound_settings">"声音设置"</string>
-    <string name="sound_and_display_settings_summary">"设置铃声、通知、屏幕亮度"</string>
+    <string name="sound_and_display_settings_summary">"设置铃声、通知和屏幕亮度"</string>
     <string name="silent_mode_title">"静音模式"</string>
-    <string name="silent_mode_summary">"除媒体和闹钟之外的所有声音都被静音"</string>
-    <!-- no translation found for silent_mode_incl_alarm_summary (2088830834182228458) -->
-    <skip />
+    <string name="silent_mode_summary">"除媒体和闹钟之外，所有声音均设为静音"</string>
+    <string name="silent_mode_incl_alarm_summary">"对所有非多媒体声音进行静音处理"</string>
     <string name="ringtone_title">"手机铃声"</string>
-    <string name="ringtone_summary">"设置默认的来电铃声"</string>
-    <string name="ring_volume_title">"响铃音量"</string>
-    <string name="ring_volume_summary">"设置来电音量和通知音量"</string>
+    <string name="ringtone_summary">"设置默认来电铃声"</string>
+    <string name="ring_volume_title">"铃声音量"</string>
+    <string name="ring_volume_summary">"设置来电和通知的音量"</string>
     <string name="vibrate_title">"手机振动"</string>
-    <string name="vibrate_summary">"手机来电时振动"</string>
+    <string name="vibrate_summary">"来电时振动手机"</string>
     <string name="notification_sound_title">"通知铃声"</string>
     <string name="notification_sound_summary">"设置默认的通知铃声"</string>
     <string name="incoming_call_volume_title">"来电音量"</string>
     <string name="notification_volume_title">"通知音量"</string>
-    <string name="checkbox_notification_same_as_incoming_call">"使用来电音量作为通知音量"</string>
+    <string name="checkbox_notification_same_as_incoming_call">"将来电音量用作通知音量"</string>
     <string name="notification_sound_dialog_title">"选择通知铃声"</string>
     <string name="media_volume_title">"媒体音量"</string>
     <string name="media_volume_summary">"设置音乐和视频的音量"</string>
-    <string name="dtmf_tone_enable_title">"屏幕按键音"</string>
-    <string name="dtmf_tone_enable_summary_on">"使用拨号面板时发出声音"</string>
-    <string name="dtmf_tone_enable_summary_off">"使用拨号面板时发出声音"</string>
+    <string name="dtmf_tone_enable_title">"操作音"</string>
+    <string name="dtmf_tone_enable_summary_on">"使用拨号键盘时发出声音"</string>
+    <string name="dtmf_tone_enable_summary_off">"使用拨号键盘时发出声音"</string>
     <string name="sound_effects_enable_title">"操作音选择"</string>
     <string name="sound_effects_enable_summary_on">"进行屏幕选择时发出声音"</string>
     <string name="sound_effects_enable_summary_off">"进行屏幕选择时发出声音"</string>
     <string name="play_media_notification_sounds_enable_title">"SD 卡通知"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"禁用 SD 卡通知声音"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"启用 SD 卡通知声音"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (7675466959375667370) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (8672617597028744693) -->
+    <skip />
     <string name="sync_settings">"数据同步"</string>
     <string name="sync_settings_summary">"选择同步哪些应用程序"</string>
+    <!-- no translation found for search_settings (1910951467596035063) -->
+    <skip />
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"显示设置"</string>
     <string name="animations_title">"动画"</string>
     <string name="animations_summary_on">"打开和关闭窗口时显示动画"</string>
     <string name="animations_summary_off">"打开和关闭窗口时显示动画"</string>
     <string name="accelerometer_title">"方向"</string>
-    <string name="accelerometer_summary_on">"旋转手机时自动改变方向"</string>
+    <string name="accelerometer_summary_on">"旋转手机时自动改变显示方向"</string>
     <string name="accelerometer_summary_off">"旋转手机时自动改变方向"</string>
     <string name="brightness">"亮度"</string>
     <string name="brightness_summary">"调整屏幕亮度"</string>
     <string name="screen_timeout">"屏幕待机"</string>
-    <string name="screen_timeout_summary">"在屏幕自动关闭前调整延迟"</string>
+    <string name="screen_timeout_summary">"调整屏幕自动关闭前的延迟"</string>
     <string name="sim_lock_settings">"SIM 卡锁定设置"</string>
     <string name="sim_lock_settings_category">"设置 SIM 卡锁定"</string>
     <string name="sim_lock_settings_title">"SIM 卡锁定"</string>
     <string name="sim_pin_toggle">"锁定 SIM 卡"</string>
-    <string name="sim_lock_on">"需要 PIN 码才能使用手机"</string>
-    <string name="sim_lock_off">"需要 PIN 码才能使用手机"</string>
-    <string name="sim_pin_change">"更改 SIM 卡 PIN 码"</string>
-    <string name="sim_enter_pin">"SIM 卡 PIN 码"</string>
+    <string name="sim_lock_on">"需要 PIN 才能使用手机"</string>
+    <string name="sim_lock_off">"需要 PIN 才能使用手机"</string>
+    <string name="sim_pin_change">"更改 SIM 卡 PIN"</string>
+    <string name="sim_enter_pin">"SIM 卡 PIN"</string>
     <string name="sim_enable_sim_lock">"锁定 SIM 卡"</string>
     <string name="sim_disable_sim_lock">"解锁 SIM 卡"</string>
-    <string name="sim_enter_old">"旧 SIM 卡 PIN 码"</string>
-    <string name="sim_enter_new">"新 SIM 卡 PIN 码"</string>
-    <string name="sim_reenter_new">"重新键入新 PIN 码"</string>
-    <string name="sim_change_pin">"SIM 卡 PIN 码"</string>
-    <string name="sim_bad_pin">"PIN 码不正确！"</string>
-    <string name="sim_pins_dont_match">"PIN 码不匹配！"</string>
-    <string name="sim_change_failed">"无法更改 PIN 码。"\n"PIN 码可能不正确。"</string>
-    <string name="sim_change_succeeded">"SIM 卡 PIN 码更改成功"</string>
-    <string name="sim_lock_failed">"无法更改 SIM 卡锁定状态。"\n"PIN 码可能不正确。"</string>
+    <string name="sim_enter_old">"旧的 SIM 卡 PIN"</string>
+    <string name="sim_enter_new">"新的 SIM 卡 PIN"</string>
+    <string name="sim_reenter_new">"重新输入新的 PIN"</string>
+    <string name="sim_change_pin">"SIM 卡 PIN"</string>
+    <string name="sim_bad_pin">"PIN 不正确！"</string>
+    <string name="sim_pins_dont_match">"PIN 不匹配！"</string>
+    <string name="sim_change_failed">"无法更改 PIN。"\n"PIN 可能不正确。"</string>
+    <string name="sim_change_succeeded">"SIM 卡 PIN 更改成功"</string>
+    <string name="sim_lock_failed">"无法更改 SIM 卡锁定状态。"\n"PIN 可能不正确。"</string>
     <string name="sim_enter_ok">"确定"</string>
     <string name="sim_enter_cancel">"取消"</string>
     <string name="device_info_settings">"手机状态"</string>
     <string name="system_update_settings_list_item_title">"系统更新"</string>
-    <string name="system_update_settings_list_item_summary">"检查系统更新"</string>
+    <string name="system_update_settings_list_item_summary">"检查是否有系统更新"</string>
     <string name="firmware_version">"固件版本"</string>
     <string name="model_number">"型号"</string>
-    <string name="baseband_version">"Baseband 版本"</string>
-    <string name="kernel_version">"Kernel 版本"</string>
-    <string name="build_number">"内部版本号"</string>
+    <string name="baseband_version">"基带版本"</string>
+    <string name="kernel_version">"内核版本"</string>
+    <string name="build_number">"版本号"</string>
     <string name="device_info_not_available">"不可用"</string>
     <string name="device_status_activity_title">"状态"</string>
     <string name="device_status">"状态"</string>
-    <string name="device_status_summary">"IMEI、手机号、信号等"</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
     <string name="storage_settings_title">"SD 卡和手机存储"</string>
     <string name="storage_settings_summary">"卸下 SD 卡，查看可用的存储空间"</string>
-    <string name="status_number">"手机号"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"手机网络类型"</string>
     <string name="status_data_state">"手机网络状态"</string>
     <string name="status_service_state">"服务状态"</string>
@@ -425,18 +495,18 @@
     <string name="status_awake_time">"唤醒时间"</string>
     <string name="internal_memory">"手机内部存储"</string>
     <string name="sd_memory">"SD 卡"</string>
-    <string name="memory_available">"可用的空间"</string>
-    <string name="memory_size">"空间总量"</string>
-    <string name="sd_eject">"删除 SD 卡"</string>
-    <string name="sd_eject_summary">"删除 SD 卡以安全移除"</string>
+    <string name="memory_available">"可用空间"</string>
+    <string name="memory_size">"总存储量"</string>
+    <string name="sd_eject">"卸下 SD 卡"</string>
+    <string name="sd_eject_summary">"卸下 SD 卡以安全移除"</string>
     <string name="sd_format">"格式化 SD 卡"</string>
     <string name="sd_format_summary">"格式化（清除）SD 卡"</string>
     <string name="sd_unavailable">"不可用"</string>
     <string name="read_only">" （只读）"</string>
     <string name="battery_status_title">"电池状态"</string>
-    <string name="battery_level_title">"电池级别"</string>
+    <string name="battery_level_title">"电池电量"</string>
     <string name="apn_settings">"APN"</string>
-    <string name="apn_edit">"编辑接入点"</string>
+    <string name="apn_edit">"修改接入点"</string>
     <string name="apn_not_set">"&lt;未设置&gt;"</string>
     <string name="apn_name">"名称"</string>
     <string name="apn_apn">"APN"</string>
@@ -463,58 +533,68 @@
     <string name="restore_default_apn">"正在恢复默认 APN 设置"</string>
     <string name="menu_restore">"重置为默认设置"</string>
     <string name="restore_default_apn_completed">"重置默认 APN 设置已完成"</string>
-    <string name="master_clear_title">"已重设出厂数据"</string>
+    <string name="master_clear_title">"恢复出厂设置"</string>
     <string name="master_clear_summary">"清除手机上的所有数据"</string>
-    <string name="master_clear_desc">"此操作会将手机重设为其初始出厂状态，即清除所有数据和下载的应用程序！"</string>
-    <string name="master_clear_button_text">"重设手机"</string>
-    <string name="master_clear_final_desc">"是否要重设手机以清除所有数据和应用程序？该操作无法撤消！"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
+    <string name="master_clear_button_text">"重置手机"</string>
+    <!-- no translation found for master_clear_final_desc (6917971132484622696) -->
+    <skip />
     <string name="master_clear_final_button_text">"清除全部内容"</string>
-    <string name="master_clear_gesture_prompt">"绘制解锁图案"</string>
-    <string name="master_clear_gesture_explanation">"您必须绘制解锁图案才能确认手机重设。"</string>
-    <string name="master_clear_failed">"未执行重设，因为 System Clear 服务不可用。"</string>
+    <string name="master_clear_gesture_prompt">"绘制您的解锁图案"</string>
+    <string name="master_clear_gesture_explanation">"您必须绘制解锁图案才能确认重置手机。"</string>
+    <string name="master_clear_failed">"未执行重置，因为系统清除服务不可用。"</string>
     <string name="media_format_title">"格式化 SD 卡。"</string>
     <string name="media_format_summary">"清除 SD 卡上的所有数据"</string>
     <string name="media_format_desc">"该操作会清除手机上的 SD 卡。您会丢失卡上的所有数据。"</string>
     <string name="media_format_button_text">"格式化 SD 卡"</string>
-    <string name="media_format_final_desc">"是否要格式化 SD 卡，以清除所有媒质？该操作不能撤消！"</string>
+    <string name="media_format_final_desc">"是否要格式化 SD 卡，以清除所有媒体？该操作不能撤消！"</string>
     <string name="media_format_final_button_text">"清除所有内容"</string>
     <string name="media_format_gesture_prompt">"绘制您的解锁图案"</string>
     <string name="media_format_gesture_explanation">"您必须绘制解锁图案才能确认格式化 SD 卡。"</string>
     <string name="call_settings_title">"通话设置"</string>
-    <string name="call_settings_summary">"设置语音信箱、呼叫转移、呼叫等待、呼叫者 ID"</string>
+    <string name="call_settings_summary">"设置语音信箱、呼叫转接、呼叫等待和来电显示"</string>
     <string name="network_settings_title">"移动网络"</string>
-    <string name="network_settings_summary">"为漫游、网络、APN 设置选项"</string>
-    <string name="location_title">"我的位置源"</string>
+    <string name="network_settings_summary">"设置漫游、网络、APN 的选项"</string>
+    <!-- no translation found for location_title (1029961368397484576) -->
+    <skip />
     <string name="location_network_based">"使用无线网络"</string>
-    <string name="location_networks_disabled">"使用无线网络查看应用程序（例如 Google 地图）中的位置"</string>
-    <string name="location_neighborhood_level">"通过 Wi-Fi 和/或移动网络确定的位置"</string>
-    <string name="location_gps">"启用 GPS 卫星设置"</string>
-    <string name="location_street_level">"定位时，精确到街道级别（取消选择可节约电量）"</string>
-    <string name="location_gps_disabled">"定位到街道级别（需要更多电量来观看天空）"</string>
+    <string name="location_networks_disabled">"使用无线网络在应用程序（例如 Google 地图）中查看位置"</string>
+    <string name="location_neighborhood_level">"通过 Wi-Fi 和/或移动网络确定 位置"</string>
+    <string name="location_gps">"启用 GPS 卫星"</string>
+    <string name="location_street_level">"定位时可精确到街道级别（取消选中可节约电量）"</string>
+    <string name="location_gps_disabled">"定位到街道级别（需要消耗更多电量并且需要显示天空视图）"</string>
+    <!-- no translation found for use_location_title (7585990952633568732) -->
+    <skip />
+    <!-- no translation found for use_location_summary (4411467143899877395) -->
+    <skip />
+    <!-- no translation found for use_location_warning_message (5696732842038416151) -->
+    <skip />
+    <string name="agree">"同意"</string>
+    <string name="disagree">"不同意"</string>
     <string name="about_settings">"关于手机"</string>
     <string name="about_settings_summary">"查看法律信息、手机状态和软件版本"</string>
     <string name="legal_information">"法律信息"</string>
-    <string name="contributors_title">"赞助商"</string>
+    <string name="contributors_title">"活动提供商"</string>
     <string name="copyright_title">"版权"</string>
     <string name="license_title">"许可"</string>
     <string name="terms_title">"条款"</string>
-    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <!-- no translation found for system_tutorial_list_item_title (9082844446660969729) -->
     <skip />
-    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
-    <skip />
-    <string name="settings_license_activity_title">"开源许可"</string>
+    <string name="system_tutorial_list_item_summary">"了解如何使用您的手机"</string>
+    <string name="settings_license_activity_title">"开放源代码许可"</string>
     <string name="settings_license_activity_unavailable">"载入许可时出现问题。"</string>
     <string name="settings_license_activity_loading">"正在载入..."</string>
     <string name="lock_settings_title">"屏幕解锁图案"</string>
     <string name="lockpattern_change_lock_pattern_label">"更改解锁图案"</string>
-    <string name="lockpattern_need_to_unlock">"确认保存的图案"</string>
+    <string name="lockpattern_need_to_unlock">"确认已保存的图案"</string>
     <string name="lockpattern_need_to_unlock_wrong">"很抱歉，请重试："</string>
     <string name="lockpattern_recording_intro_header">"绘制解锁图案"</string>
-    <string name="lockpattern_recording_intro_footer">"按“菜单”获取帮助。"</string>
+    <string name="lockpattern_recording_intro_footer">"按 MENU 获得帮助。"</string>
     <string name="lockpattern_recording_inprogress">"完成后松开手指。"</string>
-    <string name="lockpattern_recording_incorrect_too_short">"连接至少 <xliff:g id="NUMBER">%d</xliff:g> 个点。请重试："</string>
+    <string name="lockpattern_recording_incorrect_too_short">"至少连接 <xliff:g id="NUMBER">%d</xliff:g> 个点，请重试："</string>
     <string name="lockpattern_pattern_entered_header">"图案已记录！"</string>
-    <string name="lockpattern_need_to_confirm">"重新绘制图案以确认："</string>
+    <string name="lockpattern_need_to_confirm">"再次绘制图案进行确认："</string>
     <string name="lockpattern_pattern_confirmed_header">"您的新解锁图案："</string>
     <string name="lockpattern_confirm_button_text">"确认"</string>
     <string name="lockpattern_restart_button_text">"重新绘制"</string>
@@ -524,43 +604,45 @@
     <string name="lockpattern_settings_enable_title">"需要图案"</string>
     <string name="lockpattern_settings_enable_summary">"必须绘制图案才能解锁屏幕"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title">"使用可见的图案"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title">"使用触觉反馈"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"使用触控反馈"</string>
     <string name="lockpattern_settings_choose_lock_pattern">"设置解锁图案"</string>
     <string name="lockpattern_settings_change_lock_pattern">"更改解锁图案"</string>
     <string name="lockpattern_settings_help_how_to_record">"如何绘制解锁图案"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"错误尝试的次数太多！"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"错误的尝试次数过多！"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"<xliff:g id="NUMBER">%d</xliff:g> 秒后重试。"</string>
     <string name="skip_button_label">"取消"</string>
     <string name="next_button_label">"下一步"</string>
     <string name="lock_title">"保护您的手机"</string>
-    <string name="lock_intro_message"><font size="17">"通过创建个人屏幕解锁图案来保护您的手机不受未经授权的使用。"\n<font height="17">\n</font><b>"1"</b>"  在下一屏幕上，观看示例图案的绘制。"\n<font height="17">\n</font><b>"2"</b>"  准备就绪后，绘制您自己的个人解锁图案。尝试不同的图案，但至少要连接四个点。"\n<font height="17">\n</font><b>"3"</b>"  重新绘制您的图案以进行确认。"\n<font height="17">\n</font><b>"可以开始了吗？选择“下一步”"</b>"。"\n<font height="3">\n</font>"要让手机处于不受保护的状态，请选择“取消”。"</font></string>
+    <string name="lock_intro_message"><font size="17">"通过创建个人屏幕解锁图案，来保护您的手机不受未经授权的使用。"\n<font height="17">\n</font><b>"1"</b>"  在下一屏幕上，观看示例图案的绘制过程。"\n<font height="17">\n</font><b>"2"</b>"  准备就绪后，绘制您自己的个人解锁图案。可尝试不同的图案，但至少要连接四个点。"\n<font height="17">\n</font><b>"3"</b>"  重新绘制您的图案进行确认。"\n<font height="17">\n</font><b>"可以开始了吗？选择“下一步”"</b>"。"\n<font height="3">\n</font>"要让手机处于不受保护的状态，请选择“取消”。"</font></string>
     <string name="lock_example_title">"示例图案"</string>
-    <string name="lock_example_message">"连接至少四个点。"\n\n"准备好绘制自己的图案后选择“下一步”。"</string>
+    <string name="lock_example_message">"至少连接四个点。"\n\n"准备好后选择“下一步”绘制自己的图案。"</string>
     <string name="manageapplications_settings_title">"管理应用程序"</string>
     <string name="manageapplications_settings_summary">"管理和删除安装的应用程序"</string>
     <string name="applications_settings">"应用程序"</string>
     <string name="applications_settings_summary">"管理应用程序，设置快速启动快捷键"</string>
     <string name="applications_settings_header">"应用程序设置"</string>
-    <string name="install_applications">"未知源"</string>
-    <string name="install_unknown_applications">"允许安装非市场应用程序"</string>
-    <string name="install_all_warning">"您的手机和个人数据很容易受到来自未知源的应用程序的攻击。您同意单方面承担由于使用这些应用程序而可能对您的手机造成的任何损坏或数据丢失的责任。"</string>
+    <string name="install_applications">"未知来源"</string>
+    <string name="install_unknown_applications">"允许安装非电子市场提供的应用程序"</string>
+    <string name="install_all_warning">"您的手机和个人数据更容易受到来自未知来源的应用程序攻击。您同意自己对因使用这些应用程序而造成的手机损坏或数据丢失承担全部责任。"</string>
     <string name="application_info_label">"应用程序信息"</string>
     <string name="storage_label">"存储"</string>
-    <string name="auto_launch_label">"默认情况下启动"</string>
+    <string name="auto_launch_label">"默认启动"</string>
     <string name="permissions_label">"权限"</string>
     <string name="cache_header_label">"缓存"</string>
     <string name="clear_cache_btn_text">"清除缓存"</string>
     <string name="cache_size_label">"缓存"</string>
     <string name="controls_label">"控件"</string>
-    <string name="force_stop">"强制停止"</string>
-    <string name="total_size_label">"总量"</string>
+    <string name="force_stop">"强行停止"</string>
+    <string name="total_size_label">"总存储空间"</string>
     <string name="application_size_label">"应用程序"</string>
     <string name="data_size_label">"数据"</string>
     <string name="uninstall_text">"卸载"</string>
     <string name="clear_user_data_text">"清除数据"</string>
-    <string name="auto_launch_enable_text">"您已选择默认情况下启动此应用程序以执行某些操作。"</string>
-    <string name="auto_launch_disable_text">"未设置默认值。"</string>
-    <string name="clear_activities">"清除默认值"</string>
+    <!-- no translation found for app_factory_reset (6635744722502563022) -->
+    <skip />
+    <string name="auto_launch_enable_text">"您已选择在默认情况下对某些操作启动此应用程序。"</string>
+    <string name="auto_launch_disable_text">"无默认设置。"</string>
+    <string name="clear_activities">"清除默认设置"</string>
     <string name="unknown">"未知"</string>
     <string name="sort_order_alpha">"排序"</string>
     <string name="sort_order_size">"按大小排序"</string>
@@ -573,33 +655,42 @@
     <string name="loading">"正在载入..."</string>
     <string name="recompute_size">"正在重新计算大小..."</string>
     <string name="clear_data_dlg_title">"删除"</string>
-    <string name="clear_data_dlg_text">"您保存在此应用程序中的所有信息都会永久删除。"</string>
+    <string name="clear_data_dlg_text">"您保存在此应用程序中的所有信息将会永久删除。"</string>
     <string name="dlg_ok">"确定"</string>
     <string name="dlg_cancel">"取消"</string>
-    <string name="app_not_found_dlg_title">"未找到应用程序"</string>
-    <string name="app_not_found_dlg_text">"未在已安装的应用程序的列表中找到该应用程序。"</string>
+    <string name="app_not_found_dlg_title">"找不到应用程序"</string>
+    <string name="app_not_found_dlg_text">"在已安装应用程序的列表中找不到该应用程序。"</string>
     <string name="clear_data_failed">"无法清除应用程序数据。"</string>
-    <string name="security_settings_desc">"此应用程序可访问您手机上的以下内容："</string>
+    <!-- no translation found for app_factory_reset_dlg_title (6116199391150388147) -->
+    <skip />
+    <!-- no translation found for app_factory_reset_dlg_text (438395129140568893) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_title (2387060805294783175) -->
+    <skip />
+    <!-- no translation found for clear_failed_dlg_text (7943411157007320290) -->
+    <skip />
+    <string name="security_settings_desc">"此应用程序有权访问手机上的以下内容："</string>
     <string name="computing_size">"正在计算..."</string>
     <string name="invalid_size_value">"无法计算包大小"</string>
-    <string name="empty_list_msg">"您尚未安装任何第三方应用程序。"</string>
-    <string name="language_settings">"区域和文本"</string>
-    <string name="language_settings_summary">"设置区域（语言和区域）、文本输入和自动纠错选项"</string>
-    <string name="language_category">"区域设置"</string>
-    <string name="text_category">"文本设置"</string>
-    <string name="phone_language">"选择区域"</string>
+    <string name="empty_list_msg">"您没有安装任何第三方企业应用套件。"</string>
+    <!-- no translation found for version_text (9189073826278676425) -->
+    <skip />
+    <string name="language_settings">"语言区域和文字"</string>
+    <string name="language_settings_summary">"设置语言区域（语言和区域）、文字输入和自动更正选项"</string>
+    <string name="language_category">"语言区域设置"</string>
+    <string name="text_category">"文字设置"</string>
+    <string name="phone_language">"选择语言区域"</string>
     <string name="phone_language_summary">"选择语言和地区"</string>
     <string name="auto_replace">"自动替换"</string>
-    <string name="auto_replace_summary">"纠正错误键入的词"</string>
+    <string name="auto_replace_summary">"更正错误输入的字词"</string>
     <string name="auto_caps">"自动大写"</string>
-    <string name="auto_caps_summary">"将句子中的首字母大写"</string>
+    <string name="auto_caps_summary">"将句首字母大写"</string>
     <string name="auto_punctuate">"自动加标点"</string>
     <string name="hardkeyboard_category">"物理键盘设置"</string>
-    <string name="auto_punctuate_summary">"按两次空格键来插入“。”"</string>
-    <string name="show_password">"可见的密码"</string>
-    <string name="show_password_summary">"键入时显示密码"</string>
-    <!-- no translation found for ime_security_warning (3458652708716006477) -->
-    <skip />
+    <string name="auto_punctuate_summary">"按两次空格键可以插入句号"</string>
+    <string name="show_password">"密码可见"</string>
+    <string name="show_password_summary">"输入时密码可见"</string>
+    <string name="ime_security_warning">"该输入法可能会收集您输入的所有文字，包括密码和信用卡号码等个人数据。它源自 <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> 应用程序。是否要启用该输入法？"</string>
     <string name="user_dict_settings_titlebar">"用户词典"</string>
     <string name="user_dict_settings_title">"用户词典"</string>
     <string name="user_dict_settings_summary">"向用户词典中添加字词以及从用户词典中删除字词"</string>
@@ -608,7 +699,7 @@
     <string name="user_dict_settings_edit_dialog_title">"编辑字词"</string>
     <string name="user_dict_settings_context_menu_edit_title">"编辑"</string>
     <string name="user_dict_settings_context_menu_delete_title">"删除"</string>
-    <string name="user_dict_settings_empty_text">"用户词典中没有您定义的字词。您可以通过菜单添加字词。"</string>
+    <string name="user_dict_settings_empty_text">"用户词典中没有您定义的字词。您可以按 MENU 添加字词。"</string>
     <string name="testing">"测试"</string>
     <string name="testing_phone_info">"手机信息"</string>
     <string name="testing_battery_info">"电池信息"</string>
@@ -624,20 +715,24 @@
     <string name="quick_launch_clear_cancel_button">"取消"</string>
     <string name="quick_launch_display_mode_applications">"应用程序"</string>
     <string name="quick_launch_display_mode_shortcuts">"快捷键"</string>
-    <string name="input_methods_settings_title">"文本输入"</string>
-    <string name="input_methods_settings_summary">"管理文本输入选项"</string>
+    <string name="input_methods_settings_title">"文字输入"</string>
+    <string name="input_methods_settings_summary">"管理文字输入选项"</string>
     <string name="input_methods_settings_label_format">"<xliff:g id="IME_NAME">%1$s</xliff:g> 设置"</string>
     <string name="onscreen_keyboard_settings_summary">"屏幕键盘设置"</string>
     <string name="builtin_keyboard_settings_title">"设备键盘"</string>
     <string name="builtin_keyboard_settings_summary">"内置键盘设置"</string>
     <string name="development_settings_title">"开发"</string>
-    <string name="development_settings_summary">"设置应用程序开发选项"</string>
+    <string name="development_settings_summary">"设置用于应用程序开发的选项"</string>
     <string name="enable_adb">"USB 调试"</string>
     <string name="enable_adb_summary">"连接 USB 后启用调试模式"</string>
     <string name="keep_screen_on">"保持唤醒状态"</string>
     <string name="keep_screen_on_summary">"充电时屏幕不会休眠"</string>
-    <string name="allow_mock_location">"允许模仿位置"</string>
-    <string name="allow_mock_location_summary">"允许模仿位置"</string>
+    <string name="allow_mock_location">"允许模拟位置"</string>
+    <string name="allow_mock_location_summary">"允许模拟位置"</string>
+    <!-- no translation found for adb_warning_title (1756027479229533250) -->
+    <skip />
+    <!-- no translation found for adb_warning_message (5352555112049663033) -->
+    <skip />
     <string name="gadget_picker_title">"选择小工具"</string>
     <string name="widget_picker_title">"选择窗口小部件"</string>
     <string name="battery_history_details_for">"有关用户 ID %d 的详情"</string>
@@ -651,10 +746,14 @@
     <string name="battery_history_system_time">"系统时间："</string>
     <string name="battery_history_total_time">"合计时间："</string>
     <string name="battery_history_starts">"启动次数：<xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> 天 <xliff:g id="HOURS">%2$d</xliff:g> 小时 <xliff:g id="MINUTES">%3$d</xliff:g> 分 <xliff:g id="SECONDS">%4$d</xliff:g> 秒"</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> 小时 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
-    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> 秒"</string>
+    <!-- no translation found for battery_history_days (7110262897769622564) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (7525170329826274999) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (1467775596084148610) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (4283492130945761685) -->
+    <skip />
     <string name="battery_history_packages_sharing_this_uid">"共享该用户 ID 的数据包："</string>
     <string name="battery_history_no_data">"没有可用的电池使用数据"</string>
     <string name="battery_history_sensor">"传感器："</string>
@@ -676,4 +775,372 @@
     <string name="app_name_label">"应用程序"</string>
     <string name="launch_count_label">"次数"</string>
     <string name="usage_time_label">"使用时间"</string>
+    <!-- no translation found for accessibility_settings_title (4239640930601071058) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_summary (8185181964847149507) -->
+    <skip />
+    <!-- no translation found for toggle_accessibility_title (650839277066574497) -->
+    <skip />
+    <!-- no translation found for accessibility_services_category (8127851026323672607) -->
+    <skip />
+    <!-- no translation found for no_accessibility_services_summary (694578333333808159) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning (8386156287296967181) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning (8930591383312775132) -->
+    <skip />
+    <!-- no translation found for power_usage_summary_title (5180282911164282324) -->
+    <skip />
+    <!-- no translation found for power_usage_summary (7237084831082848168) -->
+    <skip />
+    <!-- no translation found for battery_since_unplugged (338073389740738437) -->
+    <skip />
+    <!-- no translation found for battery_since_reset (7464546661121187045) -->
+    <skip />
+    <!-- no translation found for battery_stats_duration (7464501326709469282) -->
+    <skip />
+    <!-- no translation found for awake (387122265874485088) -->
+    <skip />
+    <!-- no translation found for wifi_on_time (4630925382578609056) -->
+    <skip />
+    <!-- no translation found for bluetooth_on_time (4478515071957280711) -->
+    <skip />
+    <!-- no translation found for usage_name_percent (1899151069711662289) -->
+    <skip />
+    <!-- no translation found for details_title (7564809986329021063) -->
+    <skip />
+    <!-- no translation found for details_subtitle (32593908269911734) -->
+    <skip />
+    <!-- no translation found for controls_subtitle (390468421138288702) -->
+    <skip />
+    <!-- no translation found for packages_subtitle (4736416171658062768) -->
+    <skip />
+    <!-- no translation found for power_screen (2353149143338929583) -->
+    <skip />
+    <!-- no translation found for power_wifi (2382791137776486974) -->
+    <skip />
+    <!-- no translation found for power_bluetooth (4373329044379008289) -->
+    <skip />
+    <!-- no translation found for power_cell (6596471490976003056) -->
+    <skip />
+    <!-- no translation found for power_phone (5392641106474567277) -->
+    <skip />
+    <!-- no translation found for power_idle (9055659695602194990) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu (715162150698338714) -->
+    <skip />
+    <!-- no translation found for usage_type_cpu_foreground (6500579611933211831) -->
+    <skip />
+    <!-- no translation found for usage_type_gps (7989688715128160790) -->
+    <skip />
+    <!-- no translation found for usage_type_phone (9108247984998041853) -->
+    <skip />
+    <!-- no translation found for usage_type_data_send (2857401966985425427) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (7251090882025234185) -->
+    <skip />
+    <!-- no translation found for usage_type_audio (6957269406840886290) -->
+    <skip />
+    <!-- no translation found for usage_type_video (4295357792078579944) -->
+    <skip />
+    <!-- no translation found for usage_type_on_time (7052979399415080971) -->
+    <skip />
+    <!-- no translation found for battery_action_stop (649958863744041872) -->
+    <skip />
+    <!-- no translation found for battery_action_app_details (3275013531871113681) -->
+    <skip />
+    <!-- no translation found for battery_action_app_settings (350562653472577250) -->
+    <skip />
+    <!-- no translation found for battery_action_display (5302763261448580102) -->
+    <skip />
+    <!-- no translation found for battery_action_wifi (5452076674659927993) -->
+    <skip />
+    <!-- no translation found for battery_action_bluetooth (8374789049507723142) -->
+    <skip />
+    <!-- no translation found for battery_desc_voice (8980322055722959211) -->
+    <skip />
+    <!-- no translation found for battery_desc_standby (3009080001948091424) -->
+    <skip />
+    <!-- no translation found for battery_desc_radio (5479196477223185367) -->
+    <skip />
+    <!-- no translation found for battery_sugg_radio (8211336978326295047) -->
+    <skip />
+    <!-- no translation found for battery_desc_display (5432795282958076557) -->
+    <skip />
+    <!-- no translation found for battery_sugg_display (3370202402045141760) -->
+    <skip />
+    <!-- no translation found for battery_desc_wifi (1702486494565080431) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3003604969548979254) -->
+    <skip />
+    <!-- no translation found for battery_desc_bluetooth (7535520658674621902) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_basic (144393178427277439) -->
+    <skip />
+    <!-- no translation found for battery_sugg_bluetooth_headset (8214816222115517479) -->
+    <skip />
+    <!-- no translation found for battery_desc_apps (8123202939321333639) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_info (6065882899391322442) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_gps (1834412555123982714) -->
+    <skip />
+    <!-- no translation found for battery_sugg_apps_settings (8021302847272481168) -->
+    <skip />
+    <!-- no translation found for menu_stats_unplugged (8296577130840261624) -->
+    <skip />
+    <!-- no translation found for menu_stats_last_unplugged (5922246077592434526) -->
+    <skip />
+    <!-- no translation found for menu_stats_total (8973377864854807854) -->
+    <skip />
+    <!-- no translation found for menu_stats_refresh (1676215433344981075) -->
+    <skip />
+    <!-- no translation found for process_kernel_label (3916858646836739323) -->
+    <skip />
+    <!-- no translation found for process_mediaserver_label (6500382062945689285) -->
+    <skip />
+    <!-- no translation found for tts_settings (6454363854545277027) -->
+    <skip />
+    <!-- no translation found for tts_settings_summary (2627715231944602766) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (5064947197040356736) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_title (1577063839539732930) -->
+    <skip />
+    <!-- no translation found for use_default_tts_settings_summary (4253502106159206276) -->
+    <skip />
+    <!-- no translation found for tts_default_settings_section (5787915620218907443) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_title (6030550998379310088) -->
+    <skip />
+    <!-- no translation found for tts_default_rate_summary (4061815292287182801) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_title (6135942113172488671) -->
+    <skip />
+    <!-- no translation found for tts_default_pitch_summary (1328298665182885277) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_title (8018087612299820556) -->
+    <skip />
+    <!-- no translation found for tts_default_lang_summary (5219362163902707785) -->
+    <skip />
+    <!-- no translation found for tts_play_example_title (7094780383253097230) -->
+    <skip />
+    <!-- no translation found for tts_play_example_summary (8029071615047894486) -->
+    <skip />
+    <!-- no translation found for tts_install_data_title (4264378440508149986) -->
+    <skip />
+    <!-- no translation found for tts_install_data_summary (5742135732511822589) -->
+    <skip />
+    <!-- no translation found for tts_data_installed_summary (9162111552859972809) -->
+    <skip />
+    <!-- no translation found for tts_demo (405357591189935876) -->
+    <skip />
+    <!-- no translation found for tts_settings_changed_demo (4926518555912328645) -->
+    <skip />
+    <!-- no translation found for gadget_title (7455548605888590466) -->
+    <skip />
+    <!-- no translation found for vpn_settings_activity_title (7276864950701612579) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (9040615733700098831) -->
+    <skip />
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <!-- no translation found for vpn_password_colon (5716278710848606626) -->
+    <skip />
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <!-- no translation found for vpn_connect_button (1699007212602470655) -->
+    <skip />
+    <!-- no translation found for vpn_yes_button (8034531001149843119) -->
+    <skip />
+    <!-- no translation found for vpn_no_button (7620339571187119107) -->
+    <skip />
+    <!-- no translation found for vpn_back_button (192036339792734970) -->
+    <skip />
+    <!-- no translation found for vpn_mistake_button (1759404628590603933) -->
+    <skip />
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <!-- no translation found for vpn_connecting (8039521381692090116) -->
+    <skip />
+    <!-- no translation found for vpn_disconnecting (7748050200708257066) -->
+    <skip />
+    <!-- no translation found for vpn_connected (7641723116362845781) -->
+    <skip />
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (2157095890825215726) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (384234123486734768) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index a399602..d4b5738 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -32,18 +32,44 @@
     <item>"10 分鐘"</item>
     <item>"從不逾時"</item>
   </string-array>
+  <string-array name="tts_rate_entries">
+    <item>"非常慢"</item>
+    <item>"慢"</item>
+    <item>"適中"</item>
+    <item>"快"</item>
+    <item>"非常快"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item>"非常低"</item>
+    <item>"低"</item>
+    <item>"適中"</item>
+    <item>"高"</item>
+    <item>"非常高"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item>"英文 (美國)"</item>
+    <item>"英文 (英國)"</item>
+    <item>"法文"</item>
+    <item>"德文"</item>
+    <item>"義大利文"</item>
+    <item>"西班牙文"</item>
+  </string-array>
   <string-array name="wifi_security_entries">
     <item>"自動"</item>
     <item>"無"</item>
     <item>"WEP"</item>
     <item>"WPA Personal"</item>
     <item>"WPA2 Personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_security_without_auto_entries">
     <item>"無"</item>
     <item>"WEP"</item>
     <item>"WPA Personal"</item>
     <item>"WPA2 Personal"</item>
+    <item>"WPA-EAP"</item>
+    <item>"IEEE 802.1x"</item>
   </string-array>
   <string-array name="wifi_wep_type">
     <item>"自動"</item>
@@ -73,4 +99,19 @@
     <item>"啟動計數"</item>
     <item>"應用程式名稱"</item>
   </string-array>
+  <string-array name="wifi_eap_entries">
+    <item>"PEAP"</item>
+    <item>"TLS"</item>
+    <item>"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item>"無"</item>
+    <item>"PAP"</item>
+    <item>"MSCHAP"</item>
+    <item>"MSCHAP2"</item>
+    <item>"GTC"</item>
+  </string-array>
+    <!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
+    <!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
+    <!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bbaae3d..d1f1296 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -107,7 +107,10 @@
     <string name="date_and_time">"日期與時間設定"</string>
     <string name="date_time_12_hour_sample">"下午 1:00"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_changeTime_text">"變更時間"</string>
+    <string name="date_time_changeDate_text">"日期"</string>
     <string name="choose_timezone">"選取時區"</string>
+    <string name="normal_date_format">"適中 (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label">"預覽："</string>
     <string name="display_font_size_label">"字型大小："</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -188,12 +191,23 @@
     <string name="proxy_settings_label">"Proxy 設定"</string>
     <string name="cancel">"取消"</string>
     <string name="settings_label">"設定"</string>
+    <string name="settings_shortcut">"設定"</string>
     <string name="airplane_mode">"飛航模式"</string>
     <string name="airplane_mode_summary">"停用所有的無線網路連線"</string>
     <string name="airplane_mode_turning_on">"停用無線網路連線中..."</string>
     <string name="airplane_mode_turning_off">"啟用無線網路連線中..."</string>
     <string name="radio_controls_title">"無線網路控制"</string>
-    <string name="radio_controls_summary">"管理 Wi-Fi、藍牙、飛航模式與行動網路"</string>
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <string name="roaming">"漫游服務"</string>
+    <string name="roaming_enable">"漫遊時連線到資料傳輸服務"</string>
+    <string name="roaming_disable">"漫遊時連線到資料傳輸服務"</string>
+    <string name="roaming_reenable_message">"由於您不在主要網路蓋涵範圍，且已關閉漫游服務，資料連線已中斷。"</string>
+    <string name="roaming_turn_it_on_button">"開啟"</string>
+    <string name="roaming_warning">"要允許漫遊服務嗎？您可能會需要支付龐大的漫遊費用！"</string>
+    <string name="roaming_reenable_title">"注意"</string>
+    <string name="networks">"選取電信業者"</string>
+    <string name="sum_carrier_select">"選取電信業者"</string>
     <string name="date_and_time_settings_title">"日期與時間"</string>
     <string name="date_and_time_settings_summary">"設定日期、時間、時區與格式"</string>
     <string name="date_time_auto">"自動"</string>
@@ -207,7 +221,8 @@
     <string name="zone_list_menu_sort_alphabetically">"依照字母排序"</string>
     <string name="zone_list_menu_sort_by_timezone">"依時區排序"</string>
     <string name="security_settings_title">"安全性與位置"</string>
-    <string name="security_settings_summary">"設定我的位置、螢幕解鎖、SIM 卡鎖定"</string>
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
     <string name="security_passwords_title">"密碼"</string>
     <string name="bluetooth_quick_toggle_title">"藍牙"</string>
     <string name="bluetooth_quick_toggle_summary">"開啟藍牙"</string>
@@ -220,6 +235,8 @@
     <string name="bluetooth_error_title">"注意"</string>
     <string name="bluetooth_pairing_error_message">"與<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配對時發生問題。"</string>
     <string name="bluetooth_pairing_pin_error_message">"由於輸入的 PIN 不正確，因此無法與<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配對。"</string>
+    <string name="bluetooth_pairing_device_down_error_message">"無法與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」建立通訊。"</string>
+    <string name="bluetooth_pairing_rejected_error_message">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」拒絕配對要求。"</string>
     <string name="bluetooth_connecting_error_message">"連接至<xliff:g id="DEVICE_NAME">%1$s</xliff:g>時發生問題。"</string>
     <string name="bluetooth_preference_scan_title">"掃描裝置"</string>
     <string name="bluetooth_device_context_connect">"連線"</string>
@@ -260,11 +277,15 @@
     <string name="wifi_security_wep">"WEP"</string>
     <string name="wifi_security_wpa">"WPA"</string>
     <string name="wifi_security_wpa2">"WPA2"</string>
+    <string name="wifi_security_wpa_eap">"WPA-EAP"</string>
+    <string name="wifi_security_ieee8021x">"IEEE8021X"</string>
     <string name="wifi_security_unknown">"未知的"</string>
-    <string name="wifi_security_verbose_open">"開啟網路"</string>
-    <string name="wifi_security_verbose_wep">"以 WEP 加密"</string>
-    <string name="wifi_security_verbose_wpa">"以 WPA 保護連線"</string>
-    <string name="wifi_security_verbose_wpa2">"以  WPA2 保護連線"</string>
+    <string name="wifi_security_verbose_open">"開放網路"</string>
+    <string name="wifi_security_verbose_wep">"以 WEP 保護連線安全性"</string>
+    <string name="wifi_security_verbose_wpa">"以 WPA 保護連線安全性"</string>
+    <string name="wifi_security_verbose_wpa2">"以 WPA2 保護連線安全性"</string>
+    <string name="wifi_security_verbose_wpa_eap">"以 WPA-EAP 保護連線安全性"</string>
+    <string name="wifi_security_verbose_ieee8021x">"以 IEEE 802.1x 保護連線安全性"</string>
     <string name="ip_address">"IP 位址"</string>
     <string name="signal">"訊號強度"</string>
     <string name="wifi_starting">"開啟中..."</string>
@@ -277,6 +298,13 @@
     <string name="error_saving">"無法儲存網路"</string>
     <string name="connect">"連線"</string>
     <string name="connect_to_blank">"連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="please_select_eap">"EAP 方法"</string>
+    <string name="please_select_phase2">"階段 2 驗證"</string>
+    <string name="please_type_identity">"識別"</string>
+    <string name="please_type_anonymous_identity">"匿名識別"</string>
+    <string name="please_select_client_certificate">"用戶端憑證"</string>
+    <string name="please_select_ca_certificate">"CA 憑證"</string>
+    <string name="please_type_private_key_passwd">"私密金鑰密碼"</string>
     <string name="please_type_passphrase">"無線網路密碼"</string>
     <string name="please_type_hex_key">"WEP hex key (0-9，A-F)"</string>
     <string name="wifi_show_password">"顯示密碼"</string>
@@ -360,10 +388,13 @@
     <string name="sound_effects_enable_summary_on">"使用螢幕選取時播放音效"</string>
     <string name="sound_effects_enable_summary_off">"在螢幕上進行選取時播放音效"</string>
     <string name="play_media_notification_sounds_enable_title">"SD 卡通知"</string>
-    <string name="play_media_notification_sounds_enable_summary_on">"停用 SD 卡通知音效"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"啟用 SD 卡通知音效"</string>
+    <string name="play_media_notification_sounds_enable_summary_on">"播放 SD 卡通知音效"</string>
+    <string name="play_media_notification_sounds_enable_summary_off">"播放 SD 卡通知音效"</string>
     <string name="sync_settings">"資料同步處理"</string>
     <string name="sync_settings_summary">"選取要同步處理的應用程式"</string>
+    <string name="search_settings">"搜尋"</string>
+    <!-- no translation found for search_settings_summary (9205656546570654169) -->
+    <skip />
     <string name="display_settings">"顯示設定"</string>
     <string name="animations_title">"動畫"</string>
     <string name="animations_summary_on">"開啟和關閉視窗時顯示動畫"</string>
@@ -407,10 +438,18 @@
     <string name="device_info_not_available">"無法取得"</string>
     <string name="device_status_activity_title">"狀態"</string>
     <string name="device_status">"狀態"</string>
-    <string name="device_status_summary">"IMEI、電話號碼、訊號等。"</string>
+    <!-- no translation found for device_status_summary (2599162787451519618) -->
+    <skip />
     <string name="storage_settings_title">"SD 卡與手機儲存"</string>
     <string name="storage_settings_summary">"卸載 SD 卡，檢視可用儲存媒體。"</string>
-    <string name="status_number">"電話號碼"</string>
+    <!-- no translation found for status_number (5123197324870153205) -->
+    <skip />
+    <!-- no translation found for status_min_number (3519504522179420597) -->
+    <skip />
+    <!-- no translation found for status_prl_version (8499039751817386529) -->
+    <skip />
+    <!-- no translation found for status_meid_number (1751442889111731088) -->
+    <skip />
     <string name="status_network_type">"行動網路類型"</string>
     <string name="status_data_state">"行動網路狀態"</string>
     <string name="status_service_state">"服務狀態"</string>
@@ -464,9 +503,10 @@
     <string name="restore_default_apn_completed">"重設預設 APN 設定已完成"</string>
     <string name="master_clear_title">"重設為原廠設定"</string>
     <string name="master_clear_summary">"清除手機上所有資料"</string>
-    <string name="master_clear_desc">"此項操作會將手機還原至出廠設定，並清除所有資料與下載的應用程式！"</string>
+    <!-- no translation found for master_clear_desc (7823268823499739178) -->
+    <skip />
     <string name="master_clear_button_text">"重設手機"</string>
-    <string name="master_clear_final_desc">"確定要重設手機，清除所有資料與應用程式嗎？此項操作將無法復原！"</string>
+    <string name="master_clear_final_desc">"要清除所有個人資料及先前下載的應用程式嗎？這個動作無法復原！"</string>
     <string name="master_clear_final_button_text">"清除全部"</string>
     <string name="master_clear_gesture_prompt">"畫出解鎖圖形"</string>
     <string name="master_clear_gesture_explanation">"請畫出解鎖圖形，以確認重設手機。"</string>
@@ -483,13 +523,18 @@
     <string name="call_settings_summary">"設定語音信箱、來電轉接、來電待接及本機號碼顯示"</string>
     <string name="network_settings_title">"行動網路"</string>
     <string name="network_settings_summary">"設定漫遊、網路、APN 選項"</string>
-    <string name="location_title">"我的位置來源"</string>
+    <string name="location_title">"我的位置"</string>
     <string name="location_network_based">"使用無線網路"</string>
     <string name="location_networks_disabled">"使用無線網路，在應用程式中查詢位置 (例如 Google 地圖)"</string>
     <string name="location_neighborhood_level">"根據 Wi-Fi 與/或行動網路判定位置"</string>
     <string name="location_gps">"啟用 GPS 衛星接收器"</string>
     <string name="location_street_level">"定位時，精準度設定為街道等級 (取消選取此項可較省電)"</string>
     <string name="location_gps_disabled">"定位至街道等級 (需要更多電力及天候允許)"</string>
+    <string name="use_location_title">"與 Google 分享"</string>
+    <string name="use_location_summary">"允許 Google 使用位置資訊來改善搜尋與其他服務"</string>
+    <string name="use_location_warning_message">"允許 Google 使用位置資訊來改善搜尋結果與其他服務"</string>
+    <string name="agree">"同意"</string>
+    <string name="disagree">"不同意"</string>
     <string name="about_settings">"關於手機"</string>
     <string name="about_settings_summary">"檢視法律資訊、手機狀態、軟體版本"</string>
     <string name="legal_information">"法律資訊"</string>
@@ -555,6 +600,7 @@
     <string name="data_size_label">"資料"</string>
     <string name="uninstall_text">"解除安裝"</string>
     <string name="clear_user_data_text">"清除資料"</string>
+    <string name="app_factory_reset">"解除安裝更新"</string>
     <string name="auto_launch_enable_text">"您已設定在某些操作下啟動此應用程式。"</string>
     <string name="auto_launch_disable_text">"沒有預設值。"</string>
     <string name="clear_activities">"清除預設值"</string>
@@ -576,10 +622,15 @@
     <string name="app_not_found_dlg_title">"找不到應用程式"</string>
     <string name="app_not_found_dlg_text">"在已安裝程式清單中找不到此應用程式。"</string>
     <string name="clear_data_failed">"無法清除應用程式資料。"</string>
+    <string name="app_factory_reset_dlg_title">"解除安裝更新"</string>
+    <string name="app_factory_reset_dlg_text">"您想要解除安裝此 Android 系統應用程式的所有更新嗎？"</string>
+    <string name="clear_failed_dlg_title">"清除資料"</string>
+    <string name="clear_failed_dlg_text">"無法清除應用程式資訊"</string>
     <string name="security_settings_desc">"此應用程式可存取您電話中的下列項目："</string>
     <string name="computing_size">"計算中..."</string>
     <string name="invalid_size_value">"無法計算封裝大小"</string>
     <string name="empty_list_msg">"您未安裝任何第三方應用程式。"</string>
+    <string name="version_text">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="language_settings">"地區設定與文字"</string>
     <string name="language_settings_summary">"選取地區設定 (語言和地區)、文字輸入和自動校正選項"</string>
     <string name="language_category">"地區設定"</string>
@@ -634,6 +685,8 @@
     <string name="keep_screen_on_summary">"充電時螢幕不會進入休眠"</string>
     <string name="allow_mock_location">"允許模擬位置"</string>
     <string name="allow_mock_location_summary">"允許模擬位置"</string>
+    <string name="adb_warning_title">"啟用 USB 偵錯功能嗎？"</string>
+    <string name="adb_warning_message">"USB 偵錯是針對應用程式開發而設計的功能，可讓您在電腦與裝置間複製資料、不用通知即可在裝置上安裝應用程式，以及讀取記錄資料。"</string>
     <string name="gadget_picker_title">"選擇小工具"</string>
     <string name="widget_picker_title">"選擇小工具"</string>
     <string name="battery_history_details_for">"UID %d 的詳細資料"</string>
@@ -647,9 +700,9 @@
     <string name="battery_history_system_time">"系統時間："</string>
     <string name="battery_history_total_time">"總計時間："</string>
     <string name="battery_history_starts">"啟動次數：<xliff:g id="STARTS">%1$d</xliff:g>"</string>
-    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> 天，<xliff:g id="HOURS">%2$d</xliff:g> 小時，<xliff:g id="MINUTES">%3$d</xliff:g> 分鐘，<xliff:g id="SECONDS">%4$d</xliff:g> 秒"</string>
-    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> 小時，<xliff:g id="MINUTES">%2$d</xliff:g> 分鐘，<xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
-    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> 分鐘，<xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
+    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> 天 <xliff:g id="HOURS">%2$d</xliff:g> 小時 <xliff:g id="MINUTES">%3$d</xliff:g> 分 <xliff:g id="SECONDS">%4$d</xliff:g> 秒"</string>
+    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> 小時 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
+    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
     <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> 秒"</string>
     <string name="battery_history_packages_sharing_this_uid">"共用此 UID 的封裝："</string>
     <string name="battery_history_no_data">"沒有電池使用資料"</string>
@@ -672,4 +725,277 @@
     <string name="app_name_label">"應用程式"</string>
     <string name="launch_count_label">"計數"</string>
     <string name="usage_time_label">"使用時間"</string>
+    <string name="accessibility_settings_title">"協助工具"</string>
+    <string name="accessibility_settings_summary">"管理協助工具選項"</string>
+    <string name="toggle_accessibility_title">"協助工具"</string>
+    <string name="accessibility_services_category">"協助工具服務"</string>
+    <string name="no_accessibility_services_summary">"尚未安裝協助工具服務。"</string>
+    <string name="accessibility_service_security_warning">"此協助工具服務可能會收集您輸入的所有文字，包括個人資料及信用卡號碼，但並不會收集您輸入的密碼，而且它也可能會記錄您的使用者介面互動行為。該服務是由應用程式「<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>」所提供，要啟動此協助工具服務嗎？"</string>
+    <string name="accessibility_service_disable_warning">"要停用協助工具嗎？"</string>
+    <string name="power_usage_summary_title">"電池使用狀況"</string>
+    <string name="power_usage_summary">"消耗電池電力的功能"</string>
+    <string name="battery_since_unplugged">"拔除插頭後的電池使用狀況"</string>
+    <string name="battery_since_reset">"重設後的電池使用狀況"</string>
+    <string name="battery_stats_duration">"拔除插頭後已過了 <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="awake">"裝置甦醒時間"</string>
+    <string name="wifi_on_time">"WiFi 開啟時間"</string>
+    <string name="bluetooth_on_time">"WiFi 開啟時間"</string>
+    <string name="usage_name_percent">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="PERCENT">%2$s</xliff:g>%%"</string>
+    <string name="details_title">"電池使用狀況詳細資料"</string>
+    <string name="details_subtitle">"使用狀況詳細資訊"</string>
+    <string name="controls_subtitle">"調整電力使用"</string>
+    <string name="packages_subtitle">"已包含封裝檔案"</string>
+    <string name="power_screen">"顯示"</string>
+    <string name="power_wifi">"Wi-Fi"</string>
+    <string name="power_bluetooth">"藍牙"</string>
+    <string name="power_cell">"手機待命"</string>
+    <string name="power_phone">"語音通話"</string>
+    <string name="power_idle">"手機閒置"</string>
+    <string name="usage_type_cpu">"CPU 總使用時間"</string>
+    <string name="usage_type_cpu_foreground">"CPU 前端使用狀況"</string>
+    <string name="usage_type_gps">"GPS"</string>
+    <string name="usage_type_phone">"手機"</string>
+    <string name="usage_type_data_send">"已傳送資料"</string>
+    <string name="usage_type_data_recv">"已接收資料"</string>
+    <string name="usage_type_audio">"音訊"</string>
+    <string name="usage_type_video">"影片"</string>
+    <string name="usage_type_on_time">"開啟時間"</string>
+    <string name="battery_action_stop">"強制停止"</string>
+    <string name="battery_action_app_details">"應用程式資訊"</string>
+    <string name="battery_action_app_settings">"應用程式設定"</string>
+    <string name="battery_action_display">"顯示設定"</string>
+    <string name="battery_action_wifi">"WiFi 設定"</string>
+    <string name="battery_action_bluetooth">"藍牙設定"</string>
+    <string name="battery_desc_voice">"語音通話耗電量"</string>
+    <string name="battery_desc_standby">"手機閒置時的耗電量"</string>
+    <string name="battery_desc_radio">"手機無線電耗電量"</string>
+    <string name="battery_sugg_radio">"切換到飛行模式，以便裝置不在服務涵蓋範圍時能節省電力"</string>
+    <string name="battery_desc_display">"顯示與背光啟動時的耗電量"</string>
+    <string name="battery_sugg_display">"降低螢幕亮度和/或螢幕逾時時間"</string>
+    <string name="battery_desc_wifi">"Wi-Fi 耗電量"</string>
+    <string name="battery_sugg_wifi">"未使用或無法使用 WiFi 時即關閉 WiFi"</string>
+    <string name="battery_desc_bluetooth">"藍牙耗電量"</string>
+    <string name="battery_sugg_bluetooth_basic">"未使用藍牙時即關閉藍牙"</string>
+    <string name="battery_sugg_bluetooth_headset">"嘗試連線至不同的藍牙裝置"</string>
+    <string name="battery_desc_apps">"應用程式執行時的耗電量"</string>
+    <string name="battery_sugg_apps_info">"停止或解除安裝應用程式"</string>
+    <string name="battery_sugg_apps_gps">"未使用 GPS 時即關閉 GPS"</string>
+    <string name="battery_sugg_apps_settings">"應用程式可能有提供節省電力的設定"</string>
+    <string name="menu_stats_unplugged">"拔除插頭後已過了 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_last_unplugged">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> 前拔除插頭"</string>
+    <string name="menu_stats_total">"電池整體使用狀況"</string>
+    <string name="menu_stats_refresh">"重新整理"</string>
+    <string name="process_kernel_label">"Android 作業系統"</string>
+    <string name="process_mediaserver_label">"媒體伺服器"</string>
+    <string name="tts_settings">"語音合成"</string>
+    <string name="tts_settings_summary">"設定文字轉語音選項"</string>
+    <string name="tts_settings_title">"語音合成器控制項"</string>
+    <string name="use_default_tts_settings_title">"永遠使用我的設定"</string>
+    <string name="use_default_tts_settings_summary">"下列預設設定會覆寫應用程式設定"</string>
+    <string name="tts_default_settings_section">"預設設定"</string>
+    <string name="tts_default_rate_title">"語音速率"</string>
+    <string name="tts_default_rate_summary">"文字轉換成語音後的播放速度"</string>
+    <string name="tts_default_pitch_title">"音調"</string>
+    <string name="tts_default_pitch_summary">"影響文字轉語音功能的播放音調"</string>
+    <string name="tts_default_lang_title">"語言"</string>
+    <string name="tts_default_lang_summary">"為文字轉語音功能設定所使用的語言"</string>
+    <string name="tts_play_example_title">"聆聽範例"</string>
+    <string name="tts_play_example_summary">"播放簡短的語音合成範例"</string>
+    <string name="tts_install_data_title">"安裝語音資料"</string>
+    <string name="tts_install_data_summary">"安裝語音合成所需的語音資料"</string>
+    <string name="tts_data_installed_summary">"語音合成所需的語音資料已正確安裝"</string>
+    <string name="tts_demo">"請聆聽合成的範例。"</string>
+    <string name="tts_settings_changed_demo">"設定已變更，請聆聽語音範例。"</string>
+    <string name="gadget_title">"電源控制"</string>
+    <string name="vpn_settings_activity_title">"VPN 設定"</string>
+    <string name="vpn_connect_to">"連線至「%s」"</string>
+    <!-- no translation found for vpn_username_colon (7854930370861306247) -->
+    <skip />
+    <string name="vpn_password_colon">"密碼："</string>
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <string name="vpn_connect_button">"連線"</string>
+    <string name="vpn_yes_button">"是"</string>
+    <string name="vpn_no_button">"否"</string>
+    <string name="vpn_back_button">"返回"</string>
+    <string name="vpn_mistake_button">"不，這是錯誤的決定"</string>
+    <!-- no translation found for vpn_menu_done (93528279226907926) -->
+    <skip />
+    <!-- no translation found for vpn_menu_cancel (7234451214611202868) -->
+    <skip />
+    <!-- no translation found for vpn_menu_revert (4407762442281467659) -->
+    <skip />
+    <!-- no translation found for vpn_menu_connect (1089399414463784218) -->
+    <skip />
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <!-- no translation found for vpn_menu_edit (4526245173583195618) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (3326527392609513129) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_entering (1467455143582547499) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (953436717902387192) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2786397299628471911) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_profile_deletion (8679536635364177239) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_add_profile_cancellation (3377869170901609182) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_edit_profile_cancellation (7496760181072204494) -->
+    <skip />
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_type_title (6392933604218676224) -->
+    <skip />
+    <!-- no translation found for vpn_add_new_vpn (5438260689052714550) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2550661826320709266) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (1769999313158207723) -->
+    <skip />
+    <!-- no translation found for vpns (3148141862835492816) -->
+    <skip />
+    <string name="vpn_connecting">"連線中..."</string>
+    <string name="vpn_disconnecting">"中斷連線中..."</string>
+    <string name="vpn_connected">"已連線"</string>
+    <!-- no translation found for vpn_connect_hint (7442898962925875181) -->
+    <skip />
+    <!-- no translation found for vpn_name (1550918148476193076) -->
+    <skip />
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <string name="vpn_profile_added">"已新增「%s」"</string>
+    <string name="vpn_profile_replaced">"已變更「%s」的設定"</string>
+    <!-- no translation found for vpn_user_certificate_title (6812545893924071742) -->
+    <skip />
+    <!-- no translation found for vpn_user_certificate (949322691686938888) -->
+    <skip />
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate_title (7846466160795589985) -->
+    <skip />
+    <!-- no translation found for vpn_ca_certificate (465085144064264742) -->
+    <skip />
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret_string_title (5039677186748940987) -->
+    <skip />
+    <!-- no translation found for vpn_l2tp_secret (529359749677142076) -->
+    <skip />
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_title (8897005887420358913) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server (1141754908824209260) -->
+    <skip />
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <!-- no translation found for vpn_vpn_server_dialog_title (7850850940160521918) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list_title (1022776976104584251) -->
+    <skip />
+    <!-- no translation found for vpn_dns_search_list (4230034234026605360) -->
+    <skip />
+    <!-- no translation found for vpn_field_is_set (1880980734721258127) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (6827205815004809490) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8665901697706781015) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3348948489989523325) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (2286966253789266389) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (5128973727115662815) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (8028085699769751756) -->
+    <skip />
+    <!-- no translation found for vpn_settings_title (7327468307909556719) -->
+    <skip />
+    <!-- no translation found for vpn_settings_summary (8849924181594963972) -->
+    <skip />
+    <!-- no translation found for cstor_settings_category (2284299080682591107) -->
+    <skip />
+    <!-- no translation found for cstor_access_title (1739505390736236717) -->
+    <skip />
+    <!-- no translation found for cstor_access_summary (4512681868217546677) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_title (3024256293191879190) -->
+    <skip />
+    <!-- no translation found for cstor_access_dialog_hint_from_action (679746865623760961) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_title (6156763762703061470) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_summary (5248560429856597398) -->
+    <skip />
+    <!-- no translation found for cstor_set_passwd_dialog_title (4071157542842979977) -->
+    <skip />
+    <!-- no translation found for cstor_reset_title (6001600882136794382) -->
+    <skip />
+    <!-- no translation found for cstor_reset_summary (7509525030771504833) -->
+    <skip />
+    <!-- no translation found for cstor_reset_hint (5331632794451859788) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_dialog_title (1723509156126180662) -->
+    <skip />
+    <!-- no translation found for cstor_credential_name (2958936431813760259) -->
+    <skip />
+    <!-- no translation found for cstor_credential_info (6097346149400207440) -->
+    <skip />
+    <!-- no translation found for cstor_name_credential_hint (6889198058976515785) -->
+    <skip />
+    <!-- no translation found for cstor_old_password (979282118063084561) -->
+    <skip />
+    <!-- no translation found for cstor_new_password (6218562692435670047) -->
+    <skip />
+    <!-- no translation found for cstor_confirm_password (8996028123356342466) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint (1831593416099224962) -->
+    <skip />
+    <!-- no translation found for cstor_first_time_hint_from_action (4690937025845780557) -->
+    <skip />
+    <!-- no translation found for cstor_password_error (2917326097260402464) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning (3336370539045905953) -->
+    <skip />
+    <!-- no translation found for cstor_password_error_reset_warning_plural (6209069679269017200) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_error (956773958408751155) -->
+    <skip />
+    <!-- no translation found for cstor_passwords_empty_error (6062539742626760734) -->
+    <skip />
+    <!-- no translation found for cstor_password_empty_error (7249632576906961482) -->
+    <skip />
+    <!-- no translation found for cstor_password_verification_error (8553930704493511389) -->
+    <skip />
+    <!-- no translation found for cstor_name_empty_error (7499971191993770322) -->
+    <skip />
+    <!-- no translation found for cstor_name_char_error (8048089317968192516) -->
+    <skip />
+    <!-- no translation found for cstor_is_enabled (4054049098081482785) -->
+    <skip />
+    <!-- no translation found for cstor_is_added (794788474010251572) -->
+    <skip />
+    <!-- no translation found for cstor_add_error (7799232544686721435) -->
+    <skip />
+    <!-- no translation found for emergency_tone_title (1055954530111587114) -->
+    <skip />
+    <!-- no translation found for emergency_tone_summary (722259232924572153) -->
+    <skip />
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a470acc..6ec90ca 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -255,4 +255,17 @@
         <item>2</item>
     </string-array>
 
+    <!-- Locales in this list are displayed with the corresponding
+         name from special_locale_names instead of using the name
+         from Locale.getDisplayName(). -->
+    <string-array translatable="false" name="special_locale_codes">
+        <item>zh_CN</item>
+        <item>zh_TW</item>
+    </string-array>
+
+    <string-array translatable="false" name="special_locale_names">
+        <item>中文（简体）</item>
+        <item>中文 (繁體)</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8af3c58..c891979 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -890,13 +890,6 @@
     <!-- Sound & display settings screen, setting option summary to change screen timeout -->
     <string name="screen_timeout_summary">Adjust the delay before the screen automatically turns off</string>
 
-    <!-- Sound & display settings screen, compatibility mode check box label -->
-    <string name="compatibility_mode_title">Compatibility Mode</string>
-    <!-- Sound & display settings screen, compatibility mode option summary text when check box is selected -->
-    <string name="compatibility_mode_summary_on">Run older apps in Compatibility mode. This require rebooting. </string>
-    <!-- Sound & display settings screen, compatibility mode option summary text when check box is clear -->
-    <string name="compatibility_mode_summary_off">Run older apps in Compatibility mode. This require rebooting. </string>
-
     <!-- SIM lock settings title -->
     <string name="sim_lock_settings">SIM card lock settings</string>
     <!-- Security & location settings screen, setting option name -->
@@ -1093,7 +1086,7 @@
     <!-- SD card & phone storage settings screen, setting option summary text under Internal phone storage heading -->
     <string name="master_clear_summary">Erases all data on phone</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset -->
-    <string name="master_clear_desc">Factory data reset erases all of your personal information from the phone, including details about your Google account and any other accounts, system and application data and preferences, and any applications that you have downloaded. It does not change the version of the system software and bundled applications. It does not erase any photos, music, or other information stored on an SD card.</string>
+    <string name="master_clear_desc">"This will erase all data from your phone, including:\n<li>Your Google account</li>\n<li>System and application data and settings</li>\n<li>Downloaded applications</li>\nIt will not erase:\n<li>Current system software and bundled applications</li>\n<li>SD card files, such as music or photos</li>"</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
     <string name="master_clear_button_text">Reset phone</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
@@ -1658,6 +1651,8 @@ found in the list of installed applications.</string>
     <string name="battery_since_reset">Battery use since reset</string>
     <!-- Battery usage duration -->
     <string name="battery_stats_duration"><xliff:g id="time">%1$s</xliff:g> since unplugged</string>
+    <!-- Battery usage during last unplugged period -->
+    <string name="battery_stats_last_duration">@string/menu_stats_last_unplugged</string>
     <!-- CPU awake time title -->
     <string name="awake">Device awake time</string>
     <!-- Wifi on time -->
@@ -1707,7 +1702,9 @@ found in the list of installed applications.</string>
     <!-- Label for Video usage time -->
     <string name="usage_type_video">Video</string>
     <!-- Label for time that a feature has been on -->
-    <string name="usage_type_on_time">On time</string>
+    <string name="usage_type_on_time">Time on</string>
+    <!-- Label for time that there was no cell coverage -->
+    <string name="usage_type_no_coverage">Time without a signal</string>
     <!-- Label for force stop action -->
     <string name="battery_action_stop">Force stop</string>
     <!-- Label for app details action -->
@@ -1754,7 +1751,7 @@ found in the list of installed applications.</string>
     <!-- Suggestion for exploring application info to stop or uninstall -->
     <string name="battery_sugg_apps_info">Stop or uninstall the application</string>
     <!-- Suggestion for getting apps to consume less power due to GPS-->
-    <string name="battery_sugg_apps_gps">Turn off GPS when you're not using it</string>
+    <string name="battery_sugg_apps_gps">"Turn off GPS when you're not using it"</string>
     <!-- Suggestion for getting apps to consume less power -->
     <string name="battery_sugg_apps_settings">The application may offer settings to reduce battery use</string>
 
@@ -1850,6 +1847,8 @@ found in the list of installed applications.</string>
     <string name="vpn_confirm_add_profile_cancellation">Are you sure you don\'t want to create this profile?</string>
     <string name="vpn_confirm_edit_profile_cancellation">Are you sure you want to discard the changes made to this profile?</string>
     <string name="vpn_confirm_reconnect">Unable to connect to the network. Do you want to try again?</string>
+    <string name="vpn_unknown_server_dialog_msg">Server name cannot be resolved. Do you want to check your server name setting?</string>
+    <string name="vpn_auth_error_dialog_msg">The username or password you entered is incorrect. Do you want to try again?</string>
 
     <!-- VPN type selection activity title -->
     <string name="vpn_type_title">Add VPN</string>
@@ -1870,8 +1869,6 @@ found in the list of installed applications.</string>
     <!-- Preference summary text when VPN is not connected -->
     <string name="vpn_connect_hint">Connect to network</string>
 
-    <string name="vpn_default_profile_name">nowhere</string>
-
     <!-- Name of a VPN profile -->
     <string name="vpn_name">VPN name</string>
     <string name="vpn_a_name">a VPN name</string>
@@ -1968,6 +1965,8 @@ found in the list of installed applications.</string>
     <!-- Description for the credential name input box -->
     <string name="cstor_credential_name">Certificate name:</string>
     <!-- Title of the credential info -->
+    <!-- Description for the credential password input box -->
+    <string name="cstor_credential_password">Password to extract the certificate:</string>
     <string name="cstor_credential_info">Certificate details:</string>
     <string name="cstor_name_credential_hint">The name can contain only letters and numbers.</string>
 
@@ -1991,12 +1990,12 @@ found in the list of installed applications.</string>
     <string name="cstor_password_verification_error">Please enter the password again. The password must have at least 8 characters and must not contain spaces.</string>
     <string name="cstor_name_empty_error">Please enter a name.</string>
     <string name="cstor_name_char_error">Please enter a name that contains only letters and numbers.</string>
+    <string name="cstor_storage_error">Unable to save the certificate. Click OK to retry.</string>
 
     <!-- toast message -->
     <string name="cstor_is_enabled">Credential storage is enabled.</string>
     <!-- toast message -->
     <string name="cstor_is_added">%s is added.</string>
-    <string name="cstor_add_error">Failed to add %s.</string>
 
     <!-- Sound settings screen, setting check box label -->
     <string name="emergency_tone_title">Emergency tone</string>
diff --git a/res/xml-ar/timezones.xml b/res/xml-ar/timezones.xml
new file mode 100644
index 0000000..395e5e2
--- /dev/null
+++ b/res/xml-ar/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">ماجورو</timezone>
+    <timezone id="Pacific/Midway">ميدواي</timezone>
+    <timezone id="Pacific/Honolulu">هونولولو</timezone>
+    <timezone id="America/Anchorage">أنكوريج</timezone>
+    <timezone id="America/Los_Angeles">لوس انجلوس</timezone>
+    <timezone id="America/Tijuana">تيخوانا</timezone>
+    <timezone id="America/Phoenix">فينكس</timezone>
+    <timezone id="America/Chihuahua">تشيواوا</timezone>
+    <timezone id="America/Denver">دنفر</timezone>
+    <timezone id="America/Costa_Rica">Costa Rica</timezone>
+    <timezone id="America/Chicago">شيكاغو</timezone>
+    <timezone id="America/Mexico_City">مدينة المكسيك</timezone>
+    <timezone id="America/Regina">ريجينا</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">نيويورك</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Manaus">ماناوس</timezone>
+    <timezone id="America/Santiago">سانتيجو</timezone>
+    <timezone id="America/St_Johns">سانت جونز</timezone>
+    <timezone id="America/Araguaina">أروجوانيا</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">بوينوس أيرس</timezone>
+    <timezone id="America/Godthab">جودثاب</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
+    <timezone id="Atlantic/Azores">أزورس</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">لندن</timezone>
+    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
+    <timezone id="Europe/Belgrade">صربيا</timezone>
+    <timezone id="Europe/Brussels">Brussels</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Asia/Amman">Amman</timezone>
+    <timezone id="Europe/Athens">Athens</timezone>
+    <timezone id="Asia/Beirut">Beirut</timezone>
+    <timezone id="Africa/Cairo">Cairo</timezone>
+    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Baghdad</timezone>
+    <timezone id="Europe/Moscow">موسكو</timezone>
+    <timezone id="Asia/Kuwait">Kuwait</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Tehran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">أورال</timezone>
+    <timezone id="Asia/Yekaterinburg">يكاترنبيرج</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">ألماتي</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">كراسنويارسك</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
+    <timezone id="Asia/Irkutsk">ايركيتسك</timezone>
+    <timezone id="Asia/Kuala_Lumpur">كوالالمبور</timezone>
+    <timezone id="Australia/Perth">برثا</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Seoul</timezone>
+    <timezone id="Asia/Tokyo">Tokyo</timezone>
+    <timezone id="Asia/Yakutsk">ياكتسك</timezone>
+    <timezone id="Australia/Adelaide">أدليادا</timezone>
+    <timezone id="Australia/Darwin">دارون</timezone>
+    <timezone id="Australia/Brisbane">برسيبان</timezone>
+    <timezone id="Australia/Hobart">هوبارت</timezone>
+    <timezone id="Australia/Sydney">سيدني</timezone>
+    <timezone id="Asia/Vladivostok">فلاديفوستك</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">مجادن</timezone>
+    <timezone id="Pacific/Auckland">أوكلاند</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-da/timezones.xml b/res/xml-da/timezones.xml
new file mode 100644
index 0000000..eb63dce
--- /dev/null
+++ b/res/xml-da/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Alaska Time</timezone>
+    <timezone id="America/Los_Angeles">Pacific-tid (Los Angeles)</timezone>
+    <timezone id="America/Tijuana">Pacific-tid (Tijuana)</timezone>
+    <timezone id="America/Phoenix">Mountain-tid (Phoenix)</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Mountain-tid (Denver)</timezone>
+    <timezone id="America/Costa_Rica">Central-tid (Costa Rica)</timezone>
+    <timezone id="America/Chicago">Central-tid (Chicago)</timezone>
+    <timezone id="America/Mexico_City">Central-tid (Mexico City)</timezone>
+    <timezone id="America/Regina">Central-tid (Regina)</timezone>
+    <timezone id="America/Bogota">Colombiansk tid (Bogota)</timezone>
+    <timezone id="America/New_York">Eastern-tid (New York)</timezone>
+    <timezone id="America/Caracas">Venezuelansk tid (Caracas)</timezone>
+    <timezone id="America/Barbados">Atlantic-tid (Barbados)</timezone>
+    <timezone id="America/Manaus">Amazonas-tid (Manaus)</timezone>
+    <timezone id="America/Santiago">Chilensk tid (Santiago)</timezone>
+    <timezone id="America/St_Johns">Newfoundland-tid (St. Johns)</timezone>
+    <timezone id="America/Araguaina">Brasiliansk tid (Araguaina)</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Argentinsk tid (Buenos Aires)</timezone>
+    <timezone id="America/Godthab">Vestgrønlandsk tid (Nuuk)</timezone>
+    <timezone id="America/Montevideo">Uruguayansk tid (Montevideo)</timezone>
+    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
+    <timezone id="Atlantic/Azores">Azorerne</timezone>
+    <timezone id="Atlantic/Cape_Verde">Kap Verde</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">Verdenstid (London)</timezone>
+    <timezone id="Europe/Amsterdam">Mellemeuropæisk tid (Amsterdam)</timezone>
+    <timezone id="Europe/Belgrade">Mellemeuropæisk tid (Belgrade)</timezone>
+    <timezone id="Europe/Brussels">Mellemeuropæisk tid (Bruxelles)</timezone>
+    <timezone id="Europe/Sarajevo">Mellemeuropæisk tid (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Vestafrikansk tid (Brazzaville)</timezone>
+    <timezone id="Asia/Amman">østeuropæisk tid (Amman)</timezone>
+    <timezone id="Europe/Athens">østeuropæisk tid (Athen)</timezone>
+    <timezone id="Asia/Beirut">østeuropæisk tid (Beirut)</timezone>
+    <timezone id="Africa/Cairo">østeuropæisk tid (Cairo)</timezone>
+    <timezone id="Europe/Helsinki">østeuropæisk tid (Helsinki)</timezone>
+    <timezone id="Asia/Jerusalem">Israelsk normaltid (Jerusalem)</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Centralafrikansk tid (Harare)</timezone>
+    <timezone id="Asia/Baghdad">Arabisk tid (Baghdad)</timezone>
+    <timezone id="Europe/Moscow">Moskva</timezone>
+    <timezone id="Asia/Kuwait">Arabisk tid (Kuwait)</timezone>
+    <timezone id="Africa/Nairobi">østafrikansk tid (Nairobi)</timezone>
+    <timezone id="Asia/Tehran">Teheran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Afghansk tid (Kabul)</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Indisk normaltid (Calcutta)</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Bangkok">Indokinesisk tid (Bangkok)</timezone>
+    <timezone id="Asia/Hong_Kong">Hongkong-tid (Hongkong)</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Vestaustralsk tid (Perth)</timezone>
+    <timezone id="Asia/Taipei">Kinesisk normaltid (Taipei)</timezone>
+    <timezone id="Asia/Seoul">Koreansk normaltid (Seoul)</timezone>
+    <timezone id="Asia/Tokyo">Japansk normaltid (Tokyo)</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Adelaide">Centralaustralsk tid (Adelaide)</timezone>
+    <timezone id="Australia/Darwin">Centralaustralsk tid (Darwin)</timezone>
+    <timezone id="Australia/Brisbane">Østaustralsk tid (Brisbane)</timezone>
+    <timezone id="Australia/Hobart">Østaustralsk tid (Hobart)</timezone>
+    <timezone id="Australia/Sydney">Østaustralsk tid (Sydney)</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Newzealandsk tid (Auckland)</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-el/timezones.xml b/res/xml-el/timezones.xml
new file mode 100644
index 0000000..9cb4dc1
--- /dev/null
+++ b/res/xml-el/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Μαχούρο</timezone>
+    <timezone id="Pacific/Midway">Μίντγουεϊ</timezone>
+    <timezone id="Pacific/Honolulu">Χονολουλού</timezone>
+    <timezone id="America/Anchorage">Άνκορατζ</timezone>
+    <timezone id="America/Los_Angeles">Λος Άντζελες</timezone>
+    <timezone id="America/Tijuana">Τιχουάνα</timezone>
+    <timezone id="America/Phoenix">Φοίνιξ</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Ντένβερ</timezone>
+    <timezone id="America/Costa_Rica">Κόστα Ρίκα</timezone>
+    <timezone id="America/Chicago">Σικάγο</timezone>
+    <timezone id="America/Mexico_City">Πόλη του Μεξικού</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Μπογκοτά</timezone>
+    <timezone id="America/New_York">Νέα Υόρκη</timezone>
+    <timezone id="America/Caracas">Καράκας</timezone>
+    <timezone id="America/Barbados">Μπαρμπέιντος</timezone>
+    <timezone id="America/Manaus">Μανάος</timezone>
+    <timezone id="America/Santiago">Σαντιάγκο</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Araguaina">Αραγκουάινα</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Μπουένος Άιρες</timezone>
+    <timezone id="America/Godthab">Γκόνθαμπ</timezone>
+    <timezone id="America/Montevideo">Μοντεβίδεο</timezone>
+    <timezone id="Atlantic/South_Georgia">Νότια Γεωργία</timezone>
+    <timezone id="Atlantic/Azores">Αζόρες</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
+    <timezone id="Africa/Casablanca">Καζαμπλάνκα</timezone>
+    <timezone id="Europe/London">Λονδίνο</timezone>
+    <timezone id="Europe/Amsterdam">Άμστερνταμ</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">Βρυξέλλες</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Γουιντχόεκ</timezone>
+    <timezone id="Africa/Brazzaville">Μπράζαβιλ</timezone>
+    <timezone id="Asia/Amman">Αμάν</timezone>
+    <timezone id="Europe/Athens">Αθήνα</timezone>
+    <timezone id="Asia/Beirut">Βηρυτός</timezone>
+    <timezone id="Africa/Cairo">Αίγυπτος</timezone>
+    <timezone id="Europe/Helsinki">Ελσίνκι</timezone>
+    <timezone id="Asia/Jerusalem">Ιερουσαλήμ</timezone>
+    <timezone id="Europe/Minsk">Μινσκ</timezone>
+    <timezone id="Africa/Harare">Ζιμπάμπουε</timezone>
+    <timezone id="Asia/Baghdad">Βαγδάτη</timezone>
+    <timezone id="Europe/Moscow">Μόσχα</timezone>
+    <timezone id="Asia/Kuwait">Kuwait</timezone>
+    <timezone id="Africa/Nairobi">Κένυα</timezone>
+    <timezone id="Asia/Tehran">Τεχεράνη</timezone>
+    <timezone id="Asia/Baku">Μπακού</timezone>
+    <timezone id="Asia/Tbilisi">Τμπιλίσι</timezone>
+    <timezone id="Asia/Yerevan">Γερεβάν</timezone>
+    <timezone id="Asia/Dubai">Ντουμπάι</timezone>
+    <timezone id="Asia/Kabul">Καμπούλ</timezone>
+    <timezone id="Asia/Karachi">Καράτσι</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Αικατερινούπολη</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Κολόμπο</timezone>
+    <timezone id="Asia/Katmandu">Κατμαντού</timezone>
+    <timezone id="Asia/Almaty">Αλμάτυ</timezone>
+    <timezone id="Asia/Rangoon">Ρανγκούν</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Bangkok">Μπανγκόκ</timezone>
+    <timezone id="Asia/Hong_Kong">Χονγκ Κονγκ</timezone>
+    <timezone id="Asia/Irkutsk">Ιρκούτσκ</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Κουάλα Λουμπούρ</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Ταϊπέι</timezone>
+    <timezone id="Asia/Seoul">Σεούλ</timezone>
+    <timezone id="Asia/Tokyo">Τόκυο</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Adelaide">Αδελαΐδα</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Σύδνεϊ</timezone>
+    <timezone id="Asia/Vladivostok">Βλαδιβοστόκ</timezone>
+    <timezone id="Pacific/Guam">Γκουάμ</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Όκλαντ</timezone>
+    <timezone id="Pacific/Fiji">Φίτζι</timezone>
+    <timezone id="Pacific/Tongatapu">Τονγκατάπου</timezone>
+</timezones>
diff --git a/res/xml-fi/timezones.xml b/res/xml-fi/timezones.xml
new file mode 100644
index 0000000..4172ec0
--- /dev/null
+++ b/res/xml-fi/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Yhdysvaltain Tyynenmeren normaaliaika (Los Angeles)</timezone>
+    <timezone id="America/Tijuana">Yhdysvaltain Tyynenmeren normaaliaika (Tijuana)</timezone>
+    <timezone id="America/Phoenix">Kalliovuorten normaaliaika (Phoenix)</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Kalliovuorten normaaliaika (Denver)</timezone>
+    <timezone id="America/Costa_Rica">Yhdysvaltain keskinen normaaliaika (Costa Rica)</timezone>
+    <timezone id="America/Chicago">Yhdysvaltain keskinen normaaliaika (Chicago)</timezone>
+    <timezone id="America/Mexico_City">Yhdysvaltain keskinen normaaliaika (Ciudad de México)</timezone>
+    <timezone id="America/Regina">Yhdysvaltain keskinen normaaliaika (Regina)</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">Yhdysvaltain itäinen normaaliaika (New York)</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Kanadan Atlantin normaaliaika (Barbados)</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">Newfoundlandin normaaliaika (St. John's)</timezone>
+    <timezone id="America/Araguaina">Araguaina</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthåb</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">Etelä-Georgia</timezone>
+    <timezone id="Atlantic/Azores">Azorit</timezone>
+    <timezone id="Atlantic/Cape_Verde">Kap Verde</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">Greenwichin normaaliaika (Lontoo)</timezone>
+    <timezone id="Europe/Amsterdam">Keski-Euroopan normaaliaika (Amsterdam)</timezone>
+    <timezone id="Europe/Belgrade">Keski-Euroopan normaaliaika (Belgrad)</timezone>
+    <timezone id="Europe/Brussels">Keski-Euroopan normaaliaika (Bryssel)</timezone>
+    <timezone id="Europe/Sarajevo">Keski-Euroopan normaaliaika (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Asia/Amman">Itä-Euroopan normaaliaika (Amman)</timezone>
+    <timezone id="Europe/Athens">Itä-Euroopan normaaliaika (Ateena)</timezone>
+    <timezone id="Asia/Beirut">Itä-Euroopan normaaliaika (Beirut)</timezone>
+    <timezone id="Africa/Cairo">Itä-Euroopan normaaliaika (Kairo)</timezone>
+    <timezone id="Europe/Helsinki">Itä-Euroopan normaaliaika (Helsinki)</timezone>
+    <timezone id="Asia/Jerusalem">Israelin normaaliaika (Jerusalem)</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Baghdad</timezone>
+    <timezone id="Europe/Moscow">Moskova</timezone>
+    <timezone id="Asia/Kuwait">Kuwait</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Teheran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Jerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Kiinan normaaliaika (Taipei)</timezone>
+    <timezone id="Asia/Seoul">Seoul</timezone>
+    <timezone id="Asia/Tokyo">Japanin normaaliaika (Tokio)</timezone>
+    <timezone id="Asia/Yakutsk">Jakutsk</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fidzi</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-he/timezones.xml b/res/xml-he/timezones.xml
new file mode 100644
index 0000000..510e0a5
--- /dev/null
+++ b/res/xml-he/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">מאג'ורו</timezone>
+    <timezone id="Pacific/Midway">מידוויי</timezone>
+    <timezone id="Pacific/Honolulu">פסיפי/הונולולו</timezone>
+    <timezone id="America/Anchorage">זמן אלסקה</timezone>
+    <timezone id="America/Los_Angeles">אמריקה/לוס-אנג'לס</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">אמריקה/פיניקס</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">אמריקה/דנוור</timezone>
+    <timezone id="America/Costa_Rica">קוסטה ריקה</timezone>
+    <timezone id="America/Chicago">אמריקה/שיקגו</timezone>
+    <timezone id="America/Mexico_City">אמריקה/מקסיקו סיטי</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">בוגוטה</timezone>
+    <timezone id="America/New_York">אמריקה/ניו-יורק</timezone>
+    <timezone id="America/Caracas">קאראקאס</timezone>
+    <timezone id="America/Barbados">ברבדוס</timezone>
+    <timezone id="America/Manaus">מנאוס</timezone>
+    <timezone id="America/Santiago">אמריקה/סנטיאגו</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Araguaina">אראגואינה</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">בואנוס איירס</timezone>
+    <timezone id="America/Godthab">גודת'אב</timezone>
+    <timezone id="America/Montevideo">מונטווידאו</timezone>
+    <timezone id="Atlantic/South_Georgia">איי ג'ורג'יה הדרומית</timezone>
+    <timezone id="Atlantic/Azores">האיים האזורים</timezone>
+    <timezone id="Atlantic/Cape_Verde">קייפ ורדה</timezone>
+    <timezone id="Africa/Casablanca">קזבלנקה</timezone>
+    <timezone id="Europe/London">אירופה/לונדון</timezone>
+    <timezone id="Europe/Amsterdam">אמסטרדם</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">בריסל</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">ווינדהוק</timezone>
+    <timezone id="Africa/Brazzaville">בראזאווייל</timezone>
+    <timezone id="Asia/Amman">רבת עמון</timezone>
+    <timezone id="Europe/Athens">אתונה</timezone>
+    <timezone id="Asia/Beirut">ביירות</timezone>
+    <timezone id="Africa/Cairo">קהיר</timezone>
+    <timezone id="Europe/Helsinki">הלסינקי</timezone>
+    <timezone id="Asia/Jerusalem">ירושלים</timezone>
+    <timezone id="Europe/Minsk">מינסק</timezone>
+    <timezone id="Africa/Harare">הררה</timezone>
+    <timezone id="Asia/Baghdad">בגדד</timezone>
+    <timezone id="Europe/Moscow">אירופה/מוסקבה</timezone>
+    <timezone id="Asia/Kuwait">כווית</timezone>
+    <timezone id="Africa/Nairobi">ניירובי</timezone>
+    <timezone id="Asia/Tehran">טהרן</timezone>
+    <timezone id="Asia/Baku">באקו</timezone>
+    <timezone id="Asia/Tbilisi">טביליסי</timezone>
+    <timezone id="Asia/Yerevan">ירבאן</timezone>
+    <timezone id="Asia/Dubai">דובאי</timezone>
+    <timezone id="Asia/Kabul">קאבול</timezone>
+    <timezone id="Asia/Karachi">קאראצ'י</timezone>
+    <timezone id="Asia/Oral">אסיה/אורל</timezone>
+    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">קולומבו</timezone>
+    <timezone id="Asia/Katmandu">קטמנדו</timezone>
+    <timezone id="Asia/Almaty">אלמאטי</timezone>
+    <timezone id="Asia/Rangoon">ראנגון</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Bangkok">בנקוק</timezone>
+    <timezone id="Asia/Hong_Kong">הונג קונג</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">קואלה לומפור</timezone>
+    <timezone id="Australia/Perth">אוסטרליה/פרת'</timezone>
+    <timezone id="Asia/Taipei">טייפה</timezone>
+    <timezone id="Asia/Seoul">דרום קוריאה</timezone>
+    <timezone id="Asia/Tokyo">טוקיו</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Adelaide">אדלייד</timezone>
+    <timezone id="Australia/Darwin">אוסטרליה/דרווין</timezone>
+    <timezone id="Australia/Brisbane">אוסטרליה/בריסבן</timezone>
+    <timezone id="Australia/Hobart">אוסטרליה/הוברט</timezone>
+    <timezone id="Australia/Sydney">אוסטרליה/סידני</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">גואם</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">פסיפי/אוקלנד</timezone>
+    <timezone id="Pacific/Fiji">פיג'י</timezone>
+    <timezone id="Pacific/Tongatapu">טונגטאפו</timezone>
+</timezones>
diff --git a/res/xml-hr/timezones.xml b/res/xml-hr/timezones.xml
new file mode 100644
index 0000000..7280fdb
--- /dev/null
+++ b/res/xml-hr/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Alaska vremenska zona</timezone>
+    <timezone id="America/Los_Angeles">Los Angeles</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Denver</timezone>
+    <timezone id="America/Costa_Rica">Kostarika</timezone>
+    <timezone id="America/Chicago">Chicago</timezone>
+    <timezone id="America/Mexico_City">Mexico City</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Araguaina">Araguaina</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthab</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">Južna Georgia</timezone>
+    <timezone id="Atlantic/Azores">Azores</timezone>
+    <timezone id="Atlantic/Cape_Verde">Zelenortska Republika</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">London</timezone>
+    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">Brussels</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Asia/Amman">Amman</timezone>
+    <timezone id="Europe/Athens">Atena</timezone>
+    <timezone id="Asia/Beirut">Beirut</timezone>
+    <timezone id="Africa/Cairo">Cairo</timezone>
+    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Baghdad</timezone>
+    <timezone id="Europe/Moscow">Moskva</timezone>
+    <timezone id="Asia/Kuwait">Kuvajt</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Tehran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Seoul</timezone>
+    <timezone id="Asia/Tokyo">Tokio</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fidži</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-hu/timezones.xml b/res/xml-hu/timezones.xml
new file mode 100644
index 0000000..7fcc513
--- /dev/null
+++ b/res/xml-hu/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Marshall-szigeteki idő (Majuro-zátony)</timezone>
+    <timezone id="Pacific/Midway">Midway-szigetek</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">anchorage-i idő</timezone>
+    <timezone id="America/Los_Angeles">Csendes-óceáni idő (Los Angeles)</timezone>
+    <timezone id="America/Tijuana">Csendes-óceáni idő (Tijuana)</timezone>
+    <timezone id="America/Phoenix">Hegyvidéki idő (Phoenix)</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Hegyvidéki idő (Denver)</timezone>
+    <timezone id="America/Costa_Rica">Középső államokbeli idő (Costa Rica)</timezone>
+    <timezone id="America/Chicago">Középső államokbeli idő (Chicago)</timezone>
+    <timezone id="America/Mexico_City">Középső államokbeli idő (Mexikóváros)</timezone>
+    <timezone id="America/Regina">Középső államokbeli idő (Regina)</timezone>
+    <timezone id="America/Bogota">Kolumbiai idő (Bogota)</timezone>
+    <timezone id="America/New_York">Keleti államokbeli idő (New York)</timezone>
+    <timezone id="America/Caracas">Venezuelai idő (Caracas)</timezone>
+    <timezone id="America/Barbados">Atlanti-óceáni idő (Barbadosz)</timezone>
+    <timezone id="America/Manaus">Amazóniai idő (Manaus)</timezone>
+    <timezone id="America/Santiago">Chilei idő (Santiago)</timezone>
+    <timezone id="America/St_Johns">Új-fundlandi idő (St. John's)</timezone>
+    <timezone id="America/Araguaina">Brazíliai idő (Araguaína)</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Argentína idő (Buenos Aires)</timezone>
+    <timezone id="America/Godthab">Nyugat-grönlandi idő (Godthåb)</timezone>
+    <timezone id="America/Montevideo">Uruguayi idő (Montevideo)</timezone>
+    <timezone id="Atlantic/South_Georgia">Dél-grúziai idő (Dél-Georgia)</timezone>
+    <timezone id="Atlantic/Azores">Azori-szigetek</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cape verdei idő (Zöld-Foki Szigetek)</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">Greenwichi középidő (London)</timezone>
+    <timezone id="Europe/Amsterdam">Közép-európai idő (Amsterdam)</timezone>
+    <timezone id="Europe/Belgrade">Közép-európai idő (Szerbia)</timezone>
+    <timezone id="Europe/Brussels">Közép-európai idő (Brüsszel)</timezone>
+    <timezone id="Europe/Sarajevo">Közép-európai idő (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Nyugat-afrikai idő (Brazzaville)</timezone>
+    <timezone id="Asia/Amman">Kelet-európai idő (Amman)</timezone>
+    <timezone id="Europe/Athens">Kelet-európai idő (Athén)</timezone>
+    <timezone id="Asia/Beirut">Kelet-európai idő (Bejrút)</timezone>
+    <timezone id="Africa/Cairo">Kelet-európai idő (Kairó)</timezone>
+    <timezone id="Europe/Helsinki">Kelet-európai idő (Helsinki)</timezone>
+    <timezone id="Asia/Jerusalem">Izraeli zónaidő (Jerusalem)</timezone>
+    <timezone id="Europe/Minsk">Minszk</timezone>
+    <timezone id="Africa/Harare">Közép-afrikai idő (Harare)</timezone>
+    <timezone id="Asia/Baghdad">Arab idő (Bagdad)</timezone>
+    <timezone id="Europe/Moscow">Moszkva</timezone>
+    <timezone id="Asia/Kuwait">Arab idő (Kuvait)</timezone>
+    <timezone id="Africa/Nairobi">Kelet-afrikai idő (Nairobi)</timezone>
+    <timezone id="Asia/Tehran">Iráni zónaidő (Teherán)</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Jereván</timezone>
+    <timezone id="Asia/Dubai">Öbölbeli zónaidő (Dubai)</timezone>
+    <timezone id="Asia/Kabul">Afganisztáni idő (Kabul)</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Jekatyerinburg</timezone>
+    <timezone id="Asia/Calcutta">Indiai zónaidő (Calcutta)</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Nepáli idő (Katmandu)</timezone>
+    <timezone id="Asia/Almaty">almati idő</timezone>
+    <timezone id="Asia/Rangoon">Myanmari idő (Rangoon)</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasznojarszki idő (Krasznojarszk)</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Hong_Kong">Hongkongi idő (Hong Kong)</timezone>
+    <timezone id="Asia/Irkutsk">Irkutszki idő (Irkutszk)</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Nyugat-ausztrál idő (Perth)</timezone>
+    <timezone id="Asia/Taipei">Kínai zónaidő (Tajvan)</timezone>
+    <timezone id="Asia/Seoul">Koreai idő (Dél-Korea)</timezone>
+    <timezone id="Asia/Tokyo">Japán zónaidő (Tokio)</timezone>
+    <timezone id="Asia/Yakutsk">Jakutszki idő (Jakutszk)</timezone>
+    <timezone id="Australia/Adelaide">Közép-ausztráliai idő (Adelaide)</timezone>
+    <timezone id="Australia/Darwin">Közép-ausztráliai idő (Darwin)</timezone>
+    <timezone id="Australia/Brisbane">Kelet-ausztrál idő (Brisbane)</timezone>
+    <timezone id="Australia/Hobart">Kelet-ausztrál idő (Hobart)</timezone>
+    <timezone id="Australia/Sydney">Kelet-ausztrál idő (Sydney)</timezone>
+    <timezone id="Asia/Vladivostok">Vlagyivosztoki idő (Vlagyivosztok)</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadáni idő (Magadán)</timezone>
+    <timezone id="Pacific/Auckland">Új-zélandi idő (Auckland)</timezone>
+    <timezone id="Pacific/Fiji">Fidzsi idő (Fidzsi)</timezone>
+    <timezone id="Pacific/Tongatapu">Tongai idő (Tongatapu)</timezone>
+</timezones>
diff --git a/res/xml-id/timezones.xml b/res/xml-id/timezones.xml
new file mode 100644
index 0000000..c1db837
--- /dev/null
+++ b/res/xml-id/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Alaska Time</timezone>
+    <timezone id="America/Los_Angeles">Los Angeles</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Denver</timezone>
+    <timezone id="America/Costa_Rica">Kosta Rika</timezone>
+    <timezone id="America/Chicago">Chicago</timezone>
+    <timezone id="America/Mexico_City">Mexico City</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Araguaina">Araguaina</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthab</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
+    <timezone id="Atlantic/Azores">Azores</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">London</timezone>
+    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">Brussels</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Asia/Amman">Amman</timezone>
+    <timezone id="Europe/Athens">Athens</timezone>
+    <timezone id="Asia/Beirut">Beirut</timezone>
+    <timezone id="Africa/Cairo">Cairo</timezone>
+    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Baghdad</timezone>
+    <timezone id="Europe/Moscow">Moscow</timezone>
+    <timezone id="Asia/Kuwait">Kuwait</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Tehran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Seoul</timezone>
+    <timezone id="Asia/Tokyo">Tokyo</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-nb/timezones.xml b/res/xml-nb/timezones.xml
new file mode 100644
index 0000000..4bf4145
--- /dev/null
+++ b/res/xml-nb/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Los Angeles</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Denver</timezone>
+    <timezone id="America/Costa_Rica">Costa Rica</timezone>
+    <timezone id="America/Chicago">Chicago</timezone>
+    <timezone id="America/Mexico_City">Mexico by</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Bogotá</timezone>
+    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Araguaina">Araguaína</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthåb</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">Sør-Georgia</timezone>
+    <timezone id="Atlantic/Azores">Azorene</timezone>
+    <timezone id="Atlantic/Cape_Verde">Kapp Verde</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">Greenwich middeltid (London)</timezone>
+    <timezone id="Europe/Amsterdam">Sentraleuropeisk normaltid (Amsterdam)</timezone>
+    <timezone id="Europe/Belgrade">Sentraleuropeisk normaltid (Belgrade)</timezone>
+    <timezone id="Europe/Brussels">Sentraleuropeisk normaltid (Brussel)</timezone>
+    <timezone id="Europe/Sarajevo">Sentraleuropeisk normaltid (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Vestafrikansk tid (Brazzaville)</timezone>
+    <timezone id="Asia/Amman">østeuropeisk normaltid (Amman)</timezone>
+    <timezone id="Europe/Athens">østeuropeisk normaltid (Athen)</timezone>
+    <timezone id="Asia/Beirut">østeuropeisk normaltid (Beirut)</timezone>
+    <timezone id="Africa/Cairo">østeuropeisk normaltid (Kairo)</timezone>
+    <timezone id="Europe/Helsinki">østeuropeisk normaltid (Helsinki)</timezone>
+    <timezone id="Asia/Jerusalem">Israelsk standardtid (Jerusalem)</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Sentralafrikansk tid (Harare)</timezone>
+    <timezone id="Asia/Baghdad">Arabisk tid (Bagdad)</timezone>
+    <timezone id="Europe/Moscow">Moskva</timezone>
+    <timezone id="Asia/Kuwait">Arabisk tid (Kuwait)</timezone>
+    <timezone id="Africa/Nairobi">østafrikansk tid (Nairobi)</timezone>
+    <timezone id="Asia/Tehran">Teheran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Jerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Indisk standardtid (Calcutta)</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
+    <timezone id="Asia/Bangkok">Indokinesisk tid (Bangkok)</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong-tid (Hong Kong)</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Vestaustralsk tid (Perth)</timezone>
+    <timezone id="Asia/Taipei">Kinesisk standardtid (Taipei)</timezone>
+    <timezone id="Asia/Seoul">Koreansk standardtid (Seoul)</timezone>
+    <timezone id="Asia/Tokyo">Japansk standardtid (Tokyo)</timezone>
+    <timezone id="Asia/Yakutsk">Jakutsk</timezone>
+    <timezone id="Australia/Adelaide">Sentralaustralsk tid (Adelaide)</timezone>
+    <timezone id="Australia/Darwin">Sentralaustralsk tid (Darwin)</timezone>
+    <timezone id="Australia/Brisbane">østaustralsk tid (Brisbane)</timezone>
+    <timezone id="Australia/Hobart">østaustralsk tid (Hobart)</timezone>
+    <timezone id="Australia/Sydney">østaustralsk tid (Sydney)</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Newzealandsk tid (Auckland)</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-pt/timezones.xml b/res/xml-pt/timezones.xml
new file mode 100644
index 0000000..b77e30f
--- /dev/null
+++ b/res/xml-pt/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Horário do Pacífico (Los Angeles)</timezone>
+    <timezone id="America/Tijuana">Horário do Pacífico (Tijuana)</timezone>
+    <timezone id="America/Phoenix">Horário da Montanha (Phoenix)</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Horário da Montanha (Denver)</timezone>
+    <timezone id="America/Costa_Rica">Horário Padrão Central (Costa Rica)</timezone>
+    <timezone id="America/Chicago">Horário Padrão Central (Chicago)</timezone>
+    <timezone id="America/Mexico_City">Horário Padrão Central (Cidade do México)</timezone>
+    <timezone id="America/Regina">Horário Padrão Central (Regina)</timezone>
+    <timezone id="America/Bogota">Bogotá</timezone>
+    <timezone id="America/New_York">Horário Padrão Oriental (Nova Iorque)</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Horário do Atlântico (Barbados)</timezone>
+    <timezone id="America/Manaus">Horário do Amazonas (Manaus)</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">Horário Padrão de Terra Nova (St. Johns)</timezone>
+    <timezone id="America/Araguaina">Araguaína</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Horário da Argentina (Buenos Aires)</timezone>
+    <timezone id="America/Godthab">Horário da Groenlândia Ocidental (Godthab)</timezone>
+    <timezone id="America/Montevideo">Montevidéu</timezone>
+    <timezone id="Atlantic/South_Georgia">Geórgia do Sul</timezone>
+    <timezone id="Atlantic/Azores">Açores</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cabo Verde</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">Horário do Meridiano de Greenwich (Londres)</timezone>
+    <timezone id="Europe/Amsterdam">Horário da Europa Central (Amsterdã)</timezone>
+    <timezone id="Europe/Belgrade">Horário da Europa Central (Belgrade)</timezone>
+    <timezone id="Europe/Brussels">Horário da Europa Central (Bruxelas)</timezone>
+    <timezone id="Europe/Sarajevo">Horário da Europa Central (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Horário da África Ocidental (Brazzaville)</timezone>
+    <timezone id="Asia/Amman">Horário Padrão da Europa Oriental (Amã)</timezone>
+    <timezone id="Europe/Athens">Horário Padrão da Europa Oriental (Atenas)</timezone>
+    <timezone id="Asia/Beirut">Horário Padrão da Europa Oriental (Beirute)</timezone>
+    <timezone id="Africa/Cairo">Horário Padrão da Europa Oriental (Cairo)</timezone>
+    <timezone id="Europe/Helsinki">Horário Padrão da Europa Oriental (Helsinque)</timezone>
+    <timezone id="Asia/Jerusalem">Horário Padrão de Israel (Jerusalém)</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Horário da África Central (Harare)</timezone>
+    <timezone id="Asia/Baghdad">Bagdá</timezone>
+    <timezone id="Europe/Moscow">Moscou</timezone>
+    <timezone id="Asia/Kuwait">Kuwait</timezone>
+    <timezone id="Africa/Nairobi">Horário da África Oriental (Nairóbi)</timezone>
+    <timezone id="Asia/Tehran">Teerã</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Ierevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Cabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Horário Padrão da Índia (Calcutta)</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Catmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Horário Padrão da China (Taipei)</timezone>
+    <timezone id="Asia/Seoul">Seul</timezone>
+    <timezone id="Asia/Tokyo">Horário Padrão do Japão (Tóquio)</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Adelaide">Horário da Austrália Central (Adelaide)</timezone>
+    <timezone id="Australia/Darwin">Horário da Austrália Central (Darwin)</timezone>
+    <timezone id="Australia/Brisbane">Horário da Austrália Oriental (Brisbane)</timezone>
+    <timezone id="Australia/Hobart">Horário da Austrália Oriental (Hobart)</timezone>
+    <timezone id="Australia/Sydney">Horário da Austrália Oriental (Sydney)</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Horário da Nova Zelândia (Auckland)</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-ro/timezones.xml b/res/xml-ro/timezones.xml
new file mode 100644
index 0000000..c875ef7
--- /dev/null
+++ b/res/xml-ro/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Los Angeles</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Denver</timezone>
+    <timezone id="America/Costa_Rica">Costa Rica</timezone>
+    <timezone id="America/Chicago">Chicago</timezone>
+    <timezone id="America/Mexico_City">Mexico City</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Araguaina">Araguaina</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthab</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">Georgia de Sud</timezone>
+    <timezone id="Atlantic/Azores">Azore</timezone>
+    <timezone id="Atlantic/Cape_Verde">Capul Verde</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">Londra</timezone>
+    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">Bruxelles</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Asia/Amman">Amman</timezone>
+    <timezone id="Europe/Athens">Atena</timezone>
+    <timezone id="Asia/Beirut">Beirut</timezone>
+    <timezone id="Africa/Cairo">Cairo</timezone>
+    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Asia/Jerusalem">Ierusalim</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Bagdad</timezone>
+    <timezone id="Europe/Moscow">Moscova</timezone>
+    <timezone id="Asia/Kuwait">Kuweit</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Teheran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Erevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Ekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
+    <timezone id="Asia/Irkutsk">Irkuțk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Seul</timezone>
+    <timezone id="Asia/Tokyo">Tokyo</timezone>
+    <timezone id="Asia/Yakutsk">Yakuțk</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-sk/timezones.xml b/res/xml-sk/timezones.xml
new file mode 100644
index 0000000..bd00b10
--- /dev/null
+++ b/res/xml-sk/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Aljaška</timezone>
+    <timezone id="America/Los_Angeles">Los Angeles</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Denver</timezone>
+    <timezone id="America/Costa_Rica">Kostarika</timezone>
+    <timezone id="America/Chicago">Chicago</timezone>
+    <timezone id="America/Mexico_City">Mexico City</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Araguaina">Araguaina</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthab</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
+    <timezone id="Atlantic/Azores">Azorské ostrovy</timezone>
+    <timezone id="Atlantic/Cape_Verde">Kapverdy</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">Londýn</timezone>
+    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">Brussels</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Asia/Amman">Amman</timezone>
+    <timezone id="Europe/Athens">Athens</timezone>
+    <timezone id="Asia/Beirut">Beirut</timezone>
+    <timezone id="Africa/Cairo">Cairo</timezone>
+    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Baghdad</timezone>
+    <timezone id="Europe/Moscow">Moskva</timezone>
+    <timezone id="Asia/Kuwait">Kuvajt</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Tehran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnojarsko</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsko</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Seoul</timezone>
+    <timezone id="Asia/Tokyo">Tokyo</timezone>
+    <timezone id="Asia/Yakutsk">Jakutsko</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fidži</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-sr/timezones.xml b/res/xml-sr/timezones.xml
new file mode 100644
index 0000000..1b7517a
--- /dev/null
+++ b/res/xml-sr/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Мајуро</timezone>
+    <timezone id="Pacific/Midway">Мидвеј</timezone>
+    <timezone id="Pacific/Honolulu">Хонолулу</timezone>
+    <timezone id="America/Anchorage">Енкориџ</timezone>
+    <timezone id="America/Los_Angeles">Лос Анђелес</timezone>
+    <timezone id="America/Tijuana">Тихуана</timezone>
+    <timezone id="America/Phoenix">Феникс</timezone>
+    <timezone id="America/Chihuahua">Чихуахуа</timezone>
+    <timezone id="America/Denver">Денвер</timezone>
+    <timezone id="America/Costa_Rica">Костарика</timezone>
+    <timezone id="America/Chicago">Чикаго</timezone>
+    <timezone id="America/Mexico_City">Мексико Сити</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Богота</timezone>
+    <timezone id="America/New_York">Њујорк</timezone>
+    <timezone id="America/Caracas">Каракас</timezone>
+    <timezone id="America/Barbados">Барбадос</timezone>
+    <timezone id="America/Manaus">Манаус</timezone>
+    <timezone id="America/Santiago">Сантијаго</timezone>
+    <timezone id="America/St_Johns">Св. Џон</timezone>
+    <timezone id="America/Araguaina">Арагвајана</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Буенос Аирес</timezone>
+    <timezone id="America/Godthab">Нук</timezone>
+    <timezone id="America/Montevideo">Монтевидео</timezone>
+    <timezone id="Atlantic/South_Georgia">Јужна Џорџија</timezone>
+    <timezone id="Atlantic/Azores">Азори</timezone>
+    <timezone id="Atlantic/Cape_Verde">Капе Верде</timezone>
+    <timezone id="Africa/Casablanca">Казабланка</timezone>
+    <timezone id="Europe/London">Лондон</timezone>
+    <timezone id="Europe/Amsterdam">Средњеевропско време (Амстердам)</timezone>
+    <timezone id="Europe/Belgrade">Средњеевропско време (Belgrade)</timezone>
+    <timezone id="Europe/Brussels">Средњеевропско време (Брисел)</timezone>
+    <timezone id="Europe/Sarajevo">Средњеевропско време (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Виндхук</timezone>
+    <timezone id="Africa/Brazzaville">Бразавил</timezone>
+    <timezone id="Asia/Amman">Источноевропско време (Аман)</timezone>
+    <timezone id="Europe/Athens">Источноевропско време (Атина)</timezone>
+    <timezone id="Asia/Beirut">Источноевропско време (Бејрут)</timezone>
+    <timezone id="Africa/Cairo">Источноевропско време (Каиро)</timezone>
+    <timezone id="Europe/Helsinki">Источноевропско време (Хелсинки)</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Минск</timezone>
+    <timezone id="Africa/Harare">Хараре</timezone>
+    <timezone id="Asia/Baghdad">Багдад</timezone>
+    <timezone id="Europe/Moscow">Москва</timezone>
+    <timezone id="Asia/Kuwait">Кувајт</timezone>
+    <timezone id="Africa/Nairobi">Најроби</timezone>
+    <timezone id="Asia/Tehran">Техеран</timezone>
+    <timezone id="Asia/Baku">Баку</timezone>
+    <timezone id="Asia/Tbilisi">Тбилиси</timezone>
+    <timezone id="Asia/Yerevan">Јереван</timezone>
+    <timezone id="Asia/Dubai">Дубаи</timezone>
+    <timezone id="Asia/Kabul">Кабул</timezone>
+    <timezone id="Asia/Karachi">Карачи</timezone>
+    <timezone id="Asia/Oral">Орал</timezone>
+    <timezone id="Asia/Yekaterinburg">Јекатеринбург</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Коломбо</timezone>
+    <timezone id="Asia/Katmandu">Катманду</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Рангун</timezone>
+    <timezone id="Asia/Krasnoyarsk">Краснојарск</timezone>
+    <timezone id="Asia/Bangkok">Банкок</timezone>
+    <timezone id="Asia/Hong_Kong">Хонг Конг</timezone>
+    <timezone id="Asia/Irkutsk">Иркуцк</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Куала Лумпур</timezone>
+    <timezone id="Australia/Perth">Перт</timezone>
+    <timezone id="Asia/Taipei">Тајпеј</timezone>
+    <timezone id="Asia/Seoul">Сеул</timezone>
+    <timezone id="Asia/Tokyo">Токио</timezone>
+    <timezone id="Asia/Yakutsk">Јакутск</timezone>
+    <timezone id="Australia/Adelaide">Аделајд</timezone>
+    <timezone id="Australia/Darwin">Дарвин</timezone>
+    <timezone id="Australia/Brisbane">Бризбејн</timezone>
+    <timezone id="Australia/Hobart">Хобарт</timezone>
+    <timezone id="Australia/Sydney">Сиднеј</timezone>
+    <timezone id="Asia/Vladivostok">Владивосток</timezone>
+    <timezone id="Pacific/Guam">Гуам</timezone>
+    <timezone id="Asia/Magadan">Магадан</timezone>
+    <timezone id="Pacific/Auckland">Окланд</timezone>
+    <timezone id="Pacific/Fiji">Фиџи</timezone>
+    <timezone id="Pacific/Tongatapu">Тонгатапу</timezone>
+</timezones>
diff --git a/res/xml-sv/timezones.xml b/res/xml-sv/timezones.xml
new file mode 100644
index 0000000..aaed828
--- /dev/null
+++ b/res/xml-sv/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Pacific, normaltid (Los Angeles)</timezone>
+    <timezone id="America/Tijuana">Pacific, normaltid (Tijuana)</timezone>
+    <timezone id="America/Phoenix">Mountain, normaltid (Phoenix)</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Mountain, normaltid (Denver)</timezone>
+    <timezone id="America/Costa_Rica">Central, normaltid (Costa Rica)</timezone>
+    <timezone id="America/Chicago">Central, normaltid (Chicago)</timezone>
+    <timezone id="America/Mexico_City">Central, normaltid (Mexico City)</timezone>
+    <timezone id="America/Regina">Central, normaltid (Régina)</timezone>
+    <timezone id="America/Bogota">Bogotá</timezone>
+    <timezone id="America/New_York">Eastern, normaltid (New York)</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Atlantic, normaltid (Barbados)</timezone>
+    <timezone id="America/Manaus">Amazonastid (Manaus)</timezone>
+    <timezone id="America/Santiago">Chilensk tid (Santiago)</timezone>
+    <timezone id="America/St_Johns">Newfoundland, normaltid (S:t Johns)</timezone>
+    <timezone id="America/Araguaina">Brasiliansk tid (Araguaina)</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">östargentinsk tid (Buenos Aires)</timezone>
+    <timezone id="America/Godthab">Godthåb</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">Grytviken</timezone>
+    <timezone id="Atlantic/Azores">Azorerna</timezone>
+    <timezone id="Atlantic/Cape_Verde">Kap Verde</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">Greenwichtid (London)</timezone>
+    <timezone id="Europe/Amsterdam">Centraleuropa, normaltid (Amsterdam)</timezone>
+    <timezone id="Europe/Belgrade">Centraleuropa, normaltid (Belgrad)</timezone>
+    <timezone id="Europe/Brussels">Centraleuropa, normaltid (Bryssel)</timezone>
+    <timezone id="Europe/Sarajevo">Centraleuropa, normaltid (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Västafrikansk tid (Brazzaville)</timezone>
+    <timezone id="Asia/Amman">Östeuropa, normaltid (Amman)</timezone>
+    <timezone id="Europe/Athens">Östeuropa, normaltid (Aten)</timezone>
+    <timezone id="Asia/Beirut">Östeuropa, normaltid (Beirut)</timezone>
+    <timezone id="Africa/Cairo">Östeuropa, normaltid (Kairo)</timezone>
+    <timezone id="Europe/Helsinki">Östeuropa, normaltid (Helsingfors)</timezone>
+    <timezone id="Asia/Jerusalem">Israel, normaltid (Jerusalem)</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Centralafrikansk tid (Harare)</timezone>
+    <timezone id="Asia/Baghdad">Bagdad</timezone>
+    <timezone id="Europe/Moscow">Moskva</timezone>
+    <timezone id="Asia/Kuwait">Kuwait</timezone>
+    <timezone id="Africa/Nairobi">östafrikansk tid (Nairobi)</timezone>
+    <timezone id="Asia/Tehran">Teheran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Jerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Kolkata</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Kathmandu</timezone>
+    <timezone id="Asia/Almaty">Alma-Ata</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Västaustralisk tid (Perth)</timezone>
+    <timezone id="Asia/Taipei">Kinesisk tid (Taipei)</timezone>
+    <timezone id="Asia/Seoul">Söul</timezone>
+    <timezone id="Asia/Tokyo">Japan, normaltid (Tokyo)</timezone>
+    <timezone id="Asia/Yakutsk">Jakutsk</timezone>
+    <timezone id="Australia/Adelaide">Centralaustralisk tid (Adelaide)</timezone>
+    <timezone id="Australia/Darwin">Centralaustralisk tid (Darwin)</timezone>
+    <timezone id="Australia/Brisbane">östaustralisk tid (Brisbane)</timezone>
+    <timezone id="Australia/Hobart">östaustralisk tid (Hobart)</timezone>
+    <timezone id="Australia/Sydney">östaustralisk tid (Sydney)</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-th/timezones.xml b/res/xml-th/timezones.xml
new file mode 100644
index 0000000..d90c499
--- /dev/null
+++ b/res/xml-th/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">มาจูโร</timezone>
+    <timezone id="Pacific/Midway">มิดเวย์</timezone>
+    <timezone id="Pacific/Honolulu">โฮโนลูลู</timezone>
+    <timezone id="America/Anchorage">แองเคอเรจ</timezone>
+    <timezone id="America/Los_Angeles">ลอสแอนเจลิส</timezone>
+    <timezone id="America/Tijuana">ทิฮัวนา</timezone>
+    <timezone id="America/Phoenix">ฟีนิกซ์</timezone>
+    <timezone id="America/Chihuahua">ชีวาวา</timezone>
+    <timezone id="America/Denver">เดนเวอร์</timezone>
+    <timezone id="America/Costa_Rica">คอสตาริกา</timezone>
+    <timezone id="America/Chicago">ชิคาโก</timezone>
+    <timezone id="America/Mexico_City">เม็กซิโกซิตี้</timezone>
+    <timezone id="America/Regina">ริไจนา</timezone>
+    <timezone id="America/Bogota">โบโกตา</timezone>
+    <timezone id="America/New_York">นิวยอร์ก</timezone>
+    <timezone id="America/Caracas">คาราคัส</timezone>
+    <timezone id="America/Barbados">บาร์เบโดส</timezone>
+    <timezone id="America/Manaus">มาเนาส์</timezone>
+    <timezone id="America/Santiago">ซันติอาโก</timezone>
+    <timezone id="America/St_Johns">เซนต์จอนส์</timezone>
+    <timezone id="America/Araguaina">อารากัวนา</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">บัวโนสไอเรส</timezone>
+    <timezone id="America/Godthab">กอดแธบ</timezone>
+    <timezone id="America/Montevideo">มอนเตวิเดโอ</timezone>
+    <timezone id="Atlantic/South_Georgia">เซาท์ จอร์เจีย</timezone>
+    <timezone id="Atlantic/Azores">อาโซเรช</timezone>
+    <timezone id="Atlantic/Cape_Verde">เคปเวิร์ด</timezone>
+    <timezone id="Africa/Casablanca">คาสซาบลางก้า</timezone>
+    <timezone id="Europe/London">ลอนดอน</timezone>
+    <timezone id="Europe/Amsterdam">อัมสเตอดัม</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">บรัสเซลส์</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">วินด์ฮุก</timezone>
+    <timezone id="Africa/Brazzaville">บราซซาวิล</timezone>
+    <timezone id="Asia/Amman">อัมมาน</timezone>
+    <timezone id="Europe/Athens">เอเธนส์</timezone>
+    <timezone id="Asia/Beirut">เบรุต</timezone>
+    <timezone id="Africa/Cairo">ไคโร</timezone>
+    <timezone id="Europe/Helsinki">เฮลซิงกิ</timezone>
+    <timezone id="Asia/Jerusalem">เยรูซาเร็ม</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">ฮาราเร</timezone>
+    <timezone id="Asia/Baghdad">แบกแดด</timezone>
+    <timezone id="Europe/Moscow">มอสโก</timezone>
+    <timezone id="Asia/Kuwait">คูเวต</timezone>
+    <timezone id="Africa/Nairobi">ไนโรเบีย</timezone>
+    <timezone id="Asia/Tehran">เตหะราน</timezone>
+    <timezone id="Asia/Baku">บากู</timezone>
+    <timezone id="Asia/Tbilisi">ทบิลิซิ</timezone>
+    <timezone id="Asia/Yerevan">เยเรวาน</timezone>
+    <timezone id="Asia/Dubai">ดูใบ</timezone>
+    <timezone id="Asia/Kabul">คาบูล</timezone>
+    <timezone id="Asia/Karachi">การาจี</timezone>
+    <timezone id="Asia/Oral">โอรัล</timezone>
+    <timezone id="Asia/Yekaterinburg">เยคาเตรินบูร์ก</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">โคลัมโบ</timezone>
+    <timezone id="Asia/Katmandu">กาตมันดุ</timezone>
+    <timezone id="Asia/Almaty">อัลมาตี</timezone>
+    <timezone id="Asia/Rangoon">ย่างกุ้ง</timezone>
+    <timezone id="Asia/Krasnoyarsk">ครัสโนยาสค์</timezone>
+    <timezone id="Asia/Bangkok">กรุงเทพ</timezone>
+    <timezone id="Asia/Hong_Kong">ฮ่องกง</timezone>
+    <timezone id="Asia/Irkutsk">อีร์คุตสค์</timezone>
+    <timezone id="Asia/Kuala_Lumpur">กัวลาลัมเปอร์</timezone>
+    <timezone id="Australia/Perth">เพิิร์ท</timezone>
+    <timezone id="Asia/Taipei">ไทเป</timezone>
+    <timezone id="Asia/Seoul">โซล</timezone>
+    <timezone id="Asia/Tokyo">โตเกียว</timezone>
+    <timezone id="Asia/Yakutsk">ยาคุตสค์</timezone>
+    <timezone id="Australia/Adelaide">แอดิเลด</timezone>
+    <timezone id="Australia/Darwin">ดาร์วิน</timezone>
+    <timezone id="Australia/Brisbane">บริสเบน</timezone>
+    <timezone id="Australia/Hobart">โฮบาร์ต</timezone>
+    <timezone id="Australia/Sydney">ซิดนีย์</timezone>
+    <timezone id="Asia/Vladivostok">วลาดีวอสตอค</timezone>
+    <timezone id="Pacific/Guam">กวม</timezone>
+    <timezone id="Asia/Magadan">มากาดาน</timezone>
+    <timezone id="Pacific/Auckland">โอคแลนด์</timezone>
+    <timezone id="Pacific/Fiji">ฟิจิ</timezone>
+    <timezone id="Pacific/Tongatapu">ตองกาตาปู</timezone>
+</timezones>
diff --git a/res/xml-tr/timezones.xml b/res/xml-tr/timezones.xml
new file mode 100644
index 0000000..31f5d46
--- /dev/null
+++ b/res/xml-tr/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Marshall Adaları Saati (Majuro)</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Pasifik Saati (Los Angeles)</timezone>
+    <timezone id="America/Tijuana">Pasifik Saati (Tijuana)</timezone>
+    <timezone id="America/Phoenix">ABD Sıradağlar Saati (Phoenix)</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">ABD Sıradağlar Saati (Denver)</timezone>
+    <timezone id="America/Costa_Rica">Merkezi Saat (Kosta Rika)</timezone>
+    <timezone id="America/Chicago">Merkezi Saat (Şikago)</timezone>
+    <timezone id="America/Mexico_City">Merkezi Saat (Meksiko City)</timezone>
+    <timezone id="America/Regina">Merkezi Saat (Regina)</timezone>
+    <timezone id="America/Bogota">Kolombiya Saati (Bogota)</timezone>
+    <timezone id="America/New_York">Doğu Saati (New York)</timezone>
+    <timezone id="America/Caracas">Venezuela Saati (Caracas)</timezone>
+    <timezone id="America/Barbados">Atlantik Saati (Barbados)</timezone>
+    <timezone id="America/Manaus">Amazon Saati (Manaus)</timezone>
+    <timezone id="America/Santiago">Şili Saati (Santiago)</timezone>
+    <timezone id="America/St_Johns">Newfoundland Saati (St. John's)</timezone>
+    <timezone id="America/Araguaina">Brasilia Saati (Araguaina)</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Arjantin Saati (Buenos Aires)</timezone>
+    <timezone id="America/Godthab">Batı Grönland Saati (Godthab)</timezone>
+    <timezone id="America/Montevideo">Uruguay Saati (Montevideo)</timezone>
+    <timezone id="Atlantic/South_Georgia">Güney Georgia Saati (Güney Gürcistan)</timezone>
+    <timezone id="Atlantic/Azores">Azor Adaları</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cape Verde Saati (Cape Verde)</timezone>
+    <timezone id="Africa/Casablanca">Kazablanka</timezone>
+    <timezone id="Europe/London">Greenwich Merkez Saati (Londra)</timezone>
+    <timezone id="Europe/Amsterdam">Orta Avrupa Saati (Amsterdam)</timezone>
+    <timezone id="Europe/Belgrade">Orta Avrupa Saati (Belgrade)</timezone>
+    <timezone id="Europe/Brussels">Orta Avrupa Saati (Brüksel)</timezone>
+    <timezone id="Europe/Sarajevo">Orta Avrupa Saati (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Batı Afrika Saati (Brazzaville)</timezone>
+    <timezone id="Asia/Amman">Doğu Avrupa Saati (Amman)</timezone>
+    <timezone id="Europe/Athens">Doğu Avrupa Saati (Atina)</timezone>
+    <timezone id="Asia/Beirut">Doğu Avrupa Saati (Beyrut)</timezone>
+    <timezone id="Africa/Cairo">Doğu Avrupa Saati (Kahire)</timezone>
+    <timezone id="Europe/Helsinki">Doğu Avrupa Saati (Helsinki)</timezone>
+    <timezone id="Asia/Jerusalem">İsrail Saati (Kudüs)</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Orta Afrika Saati (Harare)</timezone>
+    <timezone id="Asia/Baghdad">Arap Saati (Bağdat)</timezone>
+    <timezone id="Europe/Moscow">Moskova</timezone>
+    <timezone id="Asia/Kuwait">Arap Saati (Kuveyt)</timezone>
+    <timezone id="Africa/Nairobi">Doğu Afrika Saati (Nairobi)</timezone>
+    <timezone id="Asia/Tehran">İran Standart Saati (Tahran)</timezone>
+    <timezone id="Asia/Baku">Bakü</timezone>
+    <timezone id="Asia/Tbilisi">Tiflis</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Körfez Saati (Dubai)</timezone>
+    <timezone id="Asia/Kabul">Afganistan Saati (Kabil)</timezone>
+    <timezone id="Asia/Karachi">Karaçi</timezone>
+    <timezone id="Asia/Oral">Uralsk</timezone>
+    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Hindistan Standart Saati (Calcutta)</timezone>
+    <timezone id="Asia/Colombo">Kolombo</timezone>
+    <timezone id="Asia/Katmandu">Nepal Saati (Katmandu)</timezone>
+    <timezone id="Asia/Almaty">Almatı</timezone>
+    <timezone id="Asia/Rangoon">Myanmar Saati (Rangoon)</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk Saati (Krasnoyarsk)</timezone>
+    <timezone id="Asia/Bangkok">Çinhindi Saati (Bangkok)</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong Saati (Hong Kong)</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk Saati (İrkutsk)</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Batı Avustralya Saati (Perth)</timezone>
+    <timezone id="Asia/Taipei">Çin Saati (Taipei)</timezone>
+    <timezone id="Asia/Seoul">Kore Saati (Seul)</timezone>
+    <timezone id="Asia/Tokyo">Japonya Saati (Tokyo)</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk Saati (Yakutsk)</timezone>
+    <timezone id="Australia/Adelaide">Orta Avustralya Saati (Adelaide)</timezone>
+    <timezone id="Australia/Darwin">Orta Avustralya Saati (Darwin)</timezone>
+    <timezone id="Australia/Brisbane">Doğu Avustralya Saati (Brisbane)</timezone>
+    <timezone id="Australia/Hobart">Doğu Avustralya Saati (Hobart)</timezone>
+    <timezone id="Australia/Sydney">Doğu Avustralya Saati (Sidney)</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok Saati (Vladivostok)</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan Saati (Magadan)</timezone>
+    <timezone id="Pacific/Auckland">Yeni Zelanda Saati (Auckland)</timezone>
+    <timezone id="Pacific/Fiji">Fiji Saati (Fiji)</timezone>
+    <timezone id="Pacific/Tongatapu">Tonga Saati (Tongatapu)</timezone>
+</timezones>
diff --git a/res/xml-uk/timezones.xml b/res/xml-uk/timezones.xml
new file mode 100644
index 0000000..55192ef
--- /dev/null
+++ b/res/xml-uk/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Маджуро</timezone>
+    <timezone id="Pacific/Midway">Мідуей</timezone>
+    <timezone id="Pacific/Honolulu">Гонолулу</timezone>
+    <timezone id="America/Anchorage">Анкоридж</timezone>
+    <timezone id="America/Los_Angeles">Лос-Анджелес</timezone>
+    <timezone id="America/Tijuana">Тіхуана</timezone>
+    <timezone id="America/Phoenix">Фінікс</timezone>
+    <timezone id="America/Chihuahua">Чіуауа</timezone>
+    <timezone id="America/Denver">Денвер</timezone>
+    <timezone id="America/Costa_Rica">Коста Ріка</timezone>
+    <timezone id="America/Chicago">Чикаго</timezone>
+    <timezone id="America/Mexico_City">Мехіко</timezone>
+    <timezone id="America/Regina">Реджайна</timezone>
+    <timezone id="America/Bogota">Богота</timezone>
+    <timezone id="America/New_York">Нью-Йорк</timezone>
+    <timezone id="America/Caracas">Каракас</timezone>
+    <timezone id="America/Barbados">Барбадос</timezone>
+    <timezone id="America/Manaus">Манаус</timezone>
+    <timezone id="America/Santiago">Сантьяго</timezone>
+    <timezone id="America/St_Johns">Сент-Джонс</timezone>
+    <timezone id="America/Araguaina">Арагуайна</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Буенос-Айрес</timezone>
+    <timezone id="America/Godthab">Готхоб</timezone>
+    <timezone id="America/Montevideo">Монтевідео</timezone>
+    <timezone id="Atlantic/South_Georgia">Південна Джорджія</timezone>
+    <timezone id="Atlantic/Azores">Азорські острови</timezone>
+    <timezone id="Atlantic/Cape_Verde">Кабо-Верде</timezone>
+    <timezone id="Africa/Casablanca">Касабланка</timezone>
+    <timezone id="Europe/London">Лондон</timezone>
+    <timezone id="Europe/Amsterdam">Амстердам</timezone>
+    <timezone id="Europe/Belgrade">Белград</timezone>
+    <timezone id="Europe/Brussels">Брюссель</timezone>
+    <timezone id="Europe/Sarajevo">Сараєво</timezone>
+    <timezone id="Africa/Windhoek">Віндхук</timezone>
+    <timezone id="Africa/Brazzaville">Браззавіль</timezone>
+    <timezone id="Asia/Amman">Амман</timezone>
+    <timezone id="Europe/Athens">Афіни</timezone>
+    <timezone id="Asia/Beirut">Бейрут</timezone>
+    <timezone id="Africa/Cairo">Каїр</timezone>
+    <timezone id="Europe/Helsinki">Гельсінкі</timezone>
+    <timezone id="Asia/Jerusalem">Єрусалим</timezone>
+    <timezone id="Europe/Minsk">Мінськ</timezone>
+    <timezone id="Africa/Harare">Хараре</timezone>
+    <timezone id="Asia/Baghdad">Багдад</timezone>
+    <timezone id="Europe/Moscow">Москва</timezone>
+    <timezone id="Asia/Kuwait">Кувейт</timezone>
+    <timezone id="Africa/Nairobi">Найробі</timezone>
+    <timezone id="Asia/Tehran">Тегеран</timezone>
+    <timezone id="Asia/Baku">Баку</timezone>
+    <timezone id="Asia/Tbilisi">Тбілісі</timezone>
+    <timezone id="Asia/Yerevan">Єреван</timezone>
+    <timezone id="Asia/Dubai">Дубаї</timezone>
+    <timezone id="Asia/Kabul">Кабул</timezone>
+    <timezone id="Asia/Karachi">Карачі</timezone>
+    <timezone id="Asia/Oral">Орал</timezone>
+    <timezone id="Asia/Yekaterinburg">Єкатеринбург</timezone>
+    <timezone id="Asia/Calcutta">Калькутта</timezone>
+    <timezone id="Asia/Colombo">Коломбо</timezone>
+    <timezone id="Asia/Katmandu">Катманду</timezone>
+    <timezone id="Asia/Almaty">Алмати</timezone>
+    <timezone id="Asia/Rangoon">Рангун</timezone>
+    <timezone id="Asia/Krasnoyarsk">Красноярськ</timezone>
+    <timezone id="Asia/Bangkok">Бангкок</timezone>
+    <timezone id="Asia/Hong_Kong">Гонконг</timezone>
+    <timezone id="Asia/Irkutsk">Іркутськ</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Куала-Лумпур</timezone>
+    <timezone id="Australia/Perth">Перт</timezone>
+    <timezone id="Asia/Taipei">Тайпей</timezone>
+    <timezone id="Asia/Seoul">Сеул</timezone>
+    <timezone id="Asia/Tokyo">Токіо</timezone>
+    <timezone id="Asia/Yakutsk">Якутськ</timezone>
+    <timezone id="Australia/Adelaide">Аделаїда</timezone>
+    <timezone id="Australia/Darwin">Дарвін</timezone>
+    <timezone id="Australia/Brisbane">Брисбен</timezone>
+    <timezone id="Australia/Hobart">Хобарт</timezone>
+    <timezone id="Australia/Sydney">Сідней</timezone>
+    <timezone id="Asia/Vladivostok">Владивосток</timezone>
+    <timezone id="Pacific/Guam">Гуам</timezone>
+    <timezone id="Asia/Magadan">Магадан</timezone>
+    <timezone id="Pacific/Auckland">Окленд</timezone>
+    <timezone id="Pacific/Fiji">Фіджи</timezone>
+    <timezone id="Pacific/Tongatapu">Тонгатапу</timezone>
+</timezones>
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index 34029d1..e9ded6c 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -22,72 +22,84 @@
         android:dialogTitle="@string/apn_name"
         android:key="apn_name"
         android:singleLine="true"
+        android:inputType="textEmailAddress"
         />
     <EditTextPreference
         android:title="@string/apn_apn"
         android:dialogTitle="@string/apn_apn"
         android:key="apn_apn"
         android:singleLine="true"
+        android:inputType="textEmailAddress"
         />
     <EditTextPreference
         android:title="@string/apn_http_proxy"
         android:dialogTitle="@string/apn_http_proxy"
         android:key="apn_http_proxy"
         android:singleLine="true"
+        android:inputType="textUri"
         />
     <EditTextPreference
         android:title="@string/apn_http_port"
         android:dialogTitle="@string/apn_http_port"
         android:key="apn_http_port"
         android:singleLine="true"
+        android:inputType="number"
         />
     <EditTextPreference
         android:title="@string/apn_user"
         android:dialogTitle="@string/apn_user"
         android:key="apn_user"
         android:singleLine="true"
+        android:inputType="textEmailAddress"
         />
     <EditTextPreference
         android:title="@string/apn_password"
         android:dialogTitle="@string/apn_password"
         android:key="apn_password"
         android:singleLine="true"
+        android:inputType="textPassword"
         />
     <EditTextPreference
         android:title="@string/apn_server"
         android:dialogTitle="@string/apn_server"
         android:key="apn_server"
         android:singleLine="true"
+        android:inputType="textUri"
         />
     <EditTextPreference
         android:title="@string/apn_mmsc"
         android:dialogTitle="@string/apn_mmsc"
         android:key="apn_mmsc"
         android:singleLine="true"
+        android:inputType="textUri"
         />
     <EditTextPreference
         android:title="@string/apn_mms_proxy"
         android:dialogTitle="@string/apn_mms_proxy"
         android:key="apn_mms_proxy"
         android:singleLine="true"
+        android:inputType="textUri"
         />
     <EditTextPreference
         android:title="@string/apn_mms_port"
         android:dialogTitle="@string/apn_mms_port"
         android:key="apn_mms_port"
         android:singleLine="true"
+        android:inputType="number"
         />
     <EditTextPreference
         android:title="@string/apn_mcc"
         android:dialogTitle="@string/apn_mcc"
         android:key="apn_mcc"
         android:singleLine="true"
+        android:inputType="number"
         />
     <EditTextPreference
         android:title="@string/apn_mnc"
         android:dialogTitle="@string/apn_mnc"
         android:key="apn_mnc"
         android:singleLine="true"
+        android:inputType="number"
         />
     <EditTextPreference
         android:title="@string/apn_type"
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml
index 223e52a..639204a 100644
--- a/res/xml/sound_and_display_settings.xml
+++ b/res/xml/sound_and_display_settings.xml
@@ -130,12 +130,6 @@
                 android:persistent="false"
                 android:entries="@array/screen_timeout_entries"
                 android:entryValues="@array/screen_timeout_values" />
-
-        <CheckBoxPreference
-                android:key="compatibility_mode"
-                android:title="@string/compatibility_mode_title"
-                android:summaryOn="@string/compatibility_mode_summary_on"
-                android:summaryOff="@string/compatibility_mode_summary_off" />
     </PreferenceCategory>
 
 </PreferenceScreen>   
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index b2dcee2..2ead31b 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -17,6 +17,8 @@ public class CreateShortcut extends LauncherActivity {
         Intent shortcutIntent = intentForPosition(position);
         shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
         Intent intent = new Intent();
+        intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+                Intent.ShortcutIconResource.fromContext(this, R.drawable.ic_launcher_settings));
         intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
         intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, itemForPosition(position).label);
         setResult(RESULT_OK, intent);
diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java
index 39fb6fa..d31e82c 100644
--- a/src/com/android/settings/LocalePicker.java
+++ b/src/com/android/settings/LocalePicker.java
@@ -39,6 +39,8 @@ public class LocalePicker extends ListActivity {
     private static final String TAG = "LocalePicker";
 
     Loc[] mLocales;
+    String[] mSpecialLocaleCodes;
+    String[] mSpecialLocaleNames;
 
     private static class Loc implements Comparable {
         static Collator sCollator = Collator.getInstance();
@@ -70,6 +72,9 @@ public class LocalePicker extends ListActivity {
         super.onCreate(icicle);
         setContentView(getContentView());
 
+        mSpecialLocaleCodes = getResources().getStringArray(R.array.special_locale_codes);
+        mSpecialLocaleNames = getResources().getStringArray(R.array.special_locale_names);
+
         String[] locales = getAssets().getLocales();
         Arrays.sort(locales);
 
@@ -98,15 +103,13 @@ public class LocalePicker extends ListActivity {
                             language)) {
                         Log.v(TAG, "backing up and fixing "+
                                 preprocess[finalSize-1].label+" to "+
-                                preprocess[finalSize-1].locale.
-                                getDisplayName(l));
+                                getDisplayName(preprocess[finalSize-1].locale));
                         preprocess[finalSize-1].label = toTitleCase(
-                                preprocess[finalSize-1].
-                                locale.getDisplayName(l));
+                                getDisplayName(preprocess[finalSize-1].locale));
                         Log.v(TAG, "  and adding "+
-                                toTitleCase(l.getDisplayName(l)));
+                                toTitleCase(getDisplayName(l)));
                         preprocess[finalSize++] =
-                                new Loc(toTitleCase(l.getDisplayName(l)), l);
+                                new Loc(toTitleCase(getDisplayName(l)), l);
                     } else {
                         String displayName;
                         if (s.equals("zz_ZZ")) {
@@ -140,6 +143,18 @@ public class LocalePicker extends ListActivity {
         return Character.toUpperCase(s.charAt(0)) + s.substring(1);
     }
 
+    private String getDisplayName(Locale l) {
+        String code = l.toString();
+
+        for (int i = 0; i < mSpecialLocaleCodes.length; i++) {
+            if (mSpecialLocaleCodes[i].equals(code)) {
+                return mSpecialLocaleNames[i];
+            }
+        }
+
+        return l.getDisplayName(l);
+    }
+
     @Override
     public void onResume() {
         super.onResume();
diff --git a/src/com/android/settings/ManageApplications.java b/src/com/android/settings/ManageApplications.java
index 1595de1..642a48e 100644
--- a/src/com/android/settings/ManageApplications.java
+++ b/src/com/android/settings/ManageApplications.java
@@ -55,6 +55,13 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.AdapterView.OnItemClickListener;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -108,8 +115,14 @@ public class ManageApplications extends ListActivity implements
     public static final String APP_CHG = APP_PKG_PREFIX+"changed";
     
     // attribute name used in receiver for tagging names of added/deleted packages
-    private static final String ATTR_PKG_NAME="PackageName";
-    private static final String ATTR_APP_PKG_STATS="ApplicationPackageStats";
+    private static final String ATTR_PKG_NAME="p";
+    private static final String ATTR_PKGS="ps";
+    private static final String ATTR_STATS="ss";
+    private static final String ATTR_SIZE_STRS="fs";
+    
+    private static final String ATTR_GET_SIZE_STATUS="passed";
+    private static final String ATTR_PKG_STATS="s";
+    private static final String ATTR_PKG_SIZE_STR="f";
     
     // constant value that can be used to check return code from sub activity.
     private static final int INSTALLED_APP_DETAILS = 1;
@@ -137,16 +150,16 @@ public class ManageApplications extends ListActivity implements
     // messages posted to the handler
     private static final int HANDLER_MESSAGE_BASE = 0;
     private static final int INIT_PKG_INFO = HANDLER_MESSAGE_BASE+1;
-    private static final int COMPUTE_PKG_SIZE_DONE = HANDLER_MESSAGE_BASE+2;
+    private static final int COMPUTE_BULK_SIZE = HANDLER_MESSAGE_BASE+2;
     private static final int REMOVE_PKG = HANDLER_MESSAGE_BASE+3;
     private static final int REORDER_LIST = HANDLER_MESSAGE_BASE+4;
     private static final int ADD_PKG_START = HANDLER_MESSAGE_BASE+5;
     private static final int ADD_PKG_DONE = HANDLER_MESSAGE_BASE+6;
-    private static final int REFRESH_APP_RESOURCE = HANDLER_MESSAGE_BASE+7;
+    private static final int REFRESH_LABELS = HANDLER_MESSAGE_BASE+7;
     private static final int REFRESH_DONE = HANDLER_MESSAGE_BASE+8;
     private static final int NEXT_LOAD_STEP = HANDLER_MESSAGE_BASE+9;
     private static final int COMPUTE_END = HANDLER_MESSAGE_BASE+10;
-
+    private static final int REFRESH_ICONS = HANDLER_MESSAGE_BASE+11;
     
     // observer object used for computing pkg sizes
     private PkgSizeObserver mObserver;
@@ -192,8 +205,8 @@ public class ManageApplications extends ListActivity implements
     
     String mCurrentPkgName;
     
-    //TODO implement a cache system
-    private Map<String, AppInfo> mAppPropCache;
+    // Cache application attributes
+    private AppInfoCache mCache = new AppInfoCache();
     
     // empty message displayed when list is empty
     private TextView mEmptyView;
@@ -208,6 +221,7 @@ public class ManageApplications extends ListActivity implements
     private boolean mJustCreated = true;
     private boolean mFirst = false;
     private long mLoadTimeStart;
+    private boolean mSetListViewLater = true;
     
     /*
      * Handler class to handle messages for various operations
@@ -242,7 +256,9 @@ public class ManageApplications extends ListActivity implements
      */
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
-            PackageStats ps;
+            boolean status;
+            long size;
+            String formattedSize;
             ApplicationInfo info;
             Bundle data;
             String pkgName = null;
@@ -253,28 +269,27 @@ public class ManageApplications extends ListActivity implements
             }
             switch (msg.what) {
             case INIT_PKG_INFO:
-                if(localLOGV) Log.i(TAG, "Message INIT_PKG_INFO");
+                if(localLOGV) Log.i(TAG, "Message INIT_PKG_INFO, justCreated = " + mJustCreated);
+                List<ApplicationInfo> newList = null;
                 if (!mJustCreated) {
                     // Add or delete newly created packages by comparing lists
-                    List<ApplicationInfo> newList = getInstalledApps(FILTER_APPS_ALL);
+                    newList = getInstalledApps(FILTER_APPS_ALL);
                     updateAppList(newList);
                 }
                 // Retrieve the package list and init some structures
-                initAppList(mFilterApps);
+                initAppList(newList, mFilterApps);
                 mHandler.sendEmptyMessage(NEXT_LOAD_STEP);
                 break;
-            case COMPUTE_PKG_SIZE_DONE:
-                if(localLOGV) Log.i(TAG, "Message COMPUTE_PKG_SIZE_DONE");
-                if(pkgName == null) {
+            case COMPUTE_BULK_SIZE:
+                if(localLOGV) Log.i(TAG, "Message COMPUTE_BULK_PKG_SIZE");
+                String[] pkgs = data.getStringArray(ATTR_PKGS);
+                long[] sizes = data.getLongArray(ATTR_STATS);
+                String[] formatted = data.getStringArray(ATTR_SIZE_STRS);
+                if(pkgs == null || sizes == null || formatted == null) {
                      Log.w(TAG, "Ignoring message");
                      break;
                 }
-                ps = data.getParcelable(ATTR_APP_PKG_STATS);
-                if(ps == null) {
-                    Log.i(TAG, "Invalid package stats for package:"+pkgName);
-                } else {
-                    mAppInfoAdapter.updateAppSize(pkgName, ps);
-                }
+                mAppInfoAdapter.bulkUpdateSizes(pkgs, sizes, formatted);
                 break;
             case COMPUTE_END :
                 mComputeSizes = true;
@@ -315,7 +330,6 @@ public class ManageApplications extends ListActivity implements
                     boolean ret = mAppInfoAdapter.resetAppList(mFilterApps);
                     if(!ret) {
                         // Reset cache
-                        mAppPropCache = null;
                         mFilterApps = FILTER_APPS_ALL;
                         mHandler.sendEmptyMessage(INIT_PKG_INFO);
                         sendMessageToHandler(REORDER_LIST, menuOption);
@@ -341,23 +355,31 @@ public class ManageApplications extends ListActivity implements
                     Log.w(TAG, "Couldnt find application info for:"+pkgName);
                     break;
                 }
-                mObserver.invokeGetSizeInfo(info, ADD_PKG_DONE);
+                mObserver.invokeGetSizeInfo(info);
                 break;
             case ADD_PKG_DONE:
-                if(localLOGV) Log.i(TAG, "Message COMPUTE_PKG_SIZE_DONE");
+                if(localLOGV) Log.i(TAG, "Message ADD_PKG_DONE");
                 if(pkgName == null) {
                     Log.w(TAG, "Ignoring message:ADD_PKG_START for null pkgName");
                     break;
                 }
-                ps = data.getParcelable(ATTR_APP_PKG_STATS);
-                mAppInfoAdapter.addToList(pkgName, ps);
+                status = data.getBoolean(ATTR_GET_SIZE_STATUS);
+                if (status) {
+                    size = data.getLong(ATTR_PKG_STATS);
+                    formattedSize = data.getString(ATTR_PKG_SIZE_STR);
+                    mAppInfoAdapter.addToList(pkgName, size, formattedSize);
+                }
                 break;
-            case REFRESH_APP_RESOURCE:
-               AppInfo aInfo = (AppInfo) msg.obj;
-                if(aInfo == null) {
-                    Log.w(TAG, "Error loading resources");
-                } else {
-                    mAppInfoAdapter.updateAppsResourceInfo(aInfo);   
+            case REFRESH_LABELS:
+                Map<String, CharSequence> labelMap = (Map<String, CharSequence>) msg.obj;
+                if (labelMap != null) {
+                    mAppInfoAdapter.bulkUpdateLabels(labelMap);
+                }
+                break;
+            case REFRESH_ICONS:
+                Map<String, Drawable> iconMap = (Map<String, Drawable>) msg.obj;
+                if (iconMap != null) {
+                    mAppInfoAdapter.bulkUpdateIcons(iconMap);
                 }
                 break;
             case REFRESH_DONE:
@@ -365,6 +387,12 @@ public class ManageApplications extends ListActivity implements
                 mHandler.sendEmptyMessage(NEXT_LOAD_STEP);
                 break;
             case NEXT_LOAD_STEP:
+                if (!mCache.isEmpty() && mSetListViewLater) {
+                    if (localLOGV) Log.i(TAG, "Using cache to populate list view");
+                    initListView();
+                    mSetListViewLater = false;
+                    mFirst = true;
+                }
                 if (mComputeSizes && mLoadLabels) {
                     doneLoadingData();
                     // Check for added/removed packages
@@ -387,16 +415,11 @@ public class ManageApplications extends ListActivity implements
                         initResourceThread();
                     }
                 } else {
-                    // Create list view from the adapter here. Wait till the sort order
-                    // of list is defined. its either by label or by size. so atleast one of the
-                    // first steps should be complete before filling the list
-                    mAppInfoAdapter.sortBaseList(mSortOrder);
-                    if (mJustCreated) {
-                        // Set the adapter here.
-                        mJustCreated = false;
-                        mListView.setAdapter(mAppInfoAdapter);
-                        dismissLoadingMsg();
-                    } 
+                    if (mSetListViewLater) {
+                        if (localLOGV) Log.i(TAG, "Initing list view for very first time");
+                        initListView();
+                        mSetListViewLater = false;
+                    }
                     if (!mComputeSizes) {
                         initComputeSizes();
                     } else if (!mLoadLabels) {
@@ -410,13 +433,23 @@ public class ManageApplications extends ListActivity implements
         }
     };
     
+    private void initListView() {
+       // Create list view from the adapter here. Wait till the sort order
+        // of list is defined. its either by label or by size. So atleast one of the
+        // first steps should have been completed before the list gets filled.
+        mAppInfoAdapter.sortBaseList(mSortOrder);
+        if (mJustCreated) {
+            // Set the adapter here.
+            mJustCreated = false;
+            mListView.setAdapter(mAppInfoAdapter);
+            dismissLoadingMsg();
+        }
+    }
+
    class SizeObserver extends IPackageStatsObserver.Stub {
-       private int mMsgId;
        private CountDownLatch mCount;
-       
-       SizeObserver(int msgId) {
-           mMsgId = msgId;
-       }
+       PackageStats stats;
+       boolean succeeded;
        
        public void invokeGetSize(String packageName, CountDownLatch count) {
            mCount = count;
@@ -424,21 +457,8 @@ public class ManageApplications extends ListActivity implements
        }
        
         public void onGetStatsCompleted(PackageStats pStats, boolean pSucceeded) {
-            AppInfo appInfo = null;
-            Bundle data = new Bundle();
-            data.putString(ATTR_PKG_NAME, pStats.packageName);
-            if(pSucceeded && pStats != null) {
-                if (localLOGV) Log.i(TAG, "onGetStatsCompleted::"+pStats.packageName+", ("+
-                        pStats.cacheSize+","+
-                        pStats.codeSize+", "+pStats.dataSize);
-                data.putParcelable(ATTR_APP_PKG_STATS, pStats);
-            } else {
-                Log.w(TAG, "Invalid package stats from PackageManager");
-            }
-            //post message to Handler
-            Message msg = mHandler.obtainMessage(mMsgId, data);
-            msg.setData(data);
-            mHandler.sendMessage(msg);
+            succeeded = pSucceeded;
+            stats = pStats;
             mCount.countDown();
         }
     }
@@ -447,12 +467,13 @@ public class ManageApplications extends ListActivity implements
         private List<ApplicationInfo> mPkgList;
         private SizeObserver mSizeObserver;
         private static final int END_MSG = COMPUTE_END;
-        private static final int mMsgId = COMPUTE_PKG_SIZE_DONE;
+        private static final int SEND_PKG_SIZES = COMPUTE_BULK_SIZE;
         volatile boolean abort = false;
+        static final int MSG_PKG_SIZE = 8;
         
         TaskRunner(List<ApplicationInfo> appList) {
            mPkgList = appList;
-           mSizeObserver = new SizeObserver(mMsgId);
+           mSizeObserver = new SizeObserver();
            start();
         }
         
@@ -466,27 +487,60 @@ public class ManageApplications extends ListActivity implements
                startTime =  SystemClock.elapsedRealtime();
             }
             int size = mPkgList.size();
-            for (int i = 0; i < size; i++) {
-                if (abort) {
-                    // Exit if abort has been set.
-                    break;
-                }
-                CountDownLatch count = new CountDownLatch(1);
-                String packageName = mPkgList.get(i).packageName;
-                long startPkgTime;
-                if (DEBUG_SIZE) {
-                    startPkgTime = SystemClock.elapsedRealtime();
+            int numMsgs = size / MSG_PKG_SIZE;
+            if (size > (numMsgs * MSG_PKG_SIZE)) {
+                numMsgs++;
+            }
+            int endi = 0;
+            for (int j = 0; j < size; j += MSG_PKG_SIZE) {
+                long sizes[];
+                String formatted[];
+                String packages[];
+                endi += MSG_PKG_SIZE;
+                if (endi > size) {
+                    endi = size;
                 }
-                mSizeObserver.invokeGetSize(packageName, count);
-                try {
-                    count.await();
-                } catch (InterruptedException e) {
-                    Log.i(TAG, "Failed computing size for pkg : "+packageName);
+                sizes = new long[endi-j];
+                formatted = new String[endi-j];
+                packages = new String[endi-j];
+                for (int i = j; i < endi; i++) {
+                    if (abort) {
+                        // Exit if abort has been set.
+                        break;
+                    }
+                    CountDownLatch count = new CountDownLatch(1);
+                    String packageName = mPkgList.get(i).packageName;
+                    mSizeObserver.invokeGetSize(packageName, count);
+                    try {
+                        count.await();
+                    } catch (InterruptedException e) {
+                        Log.i(TAG, "Failed computing size for pkg : "+packageName);
+                    }
+                    // Process the package statistics
+                    PackageStats pStats = mSizeObserver.stats;
+                    boolean succeeded = mSizeObserver.succeeded;
+                    long total;
+                    if(succeeded && pStats != null) {
+                        total = getTotalSize(pStats);
+                    } else {
+                        total = SIZE_INVALID;
+                    }
+                    sizes[i-j] = total;
+                    formatted[i-j] = getSizeStr(total).toString();
+                    packages[i-j] = packageName;
                 }
-                if (DEBUG_SIZE) Log.i(TAG, "Took "+(SystemClock.elapsedRealtime() - startPkgTime) +
-                        " ms to compute size for pkg : "+packageName);
+                // Post update message
+                Bundle data = new Bundle();
+                data.putStringArray(ATTR_PKGS, packages);
+                data.putLongArray(ATTR_STATS, sizes);
+                data.putStringArray(ATTR_SIZE_STRS, formatted);
+                Message msg = mHandler.obtainMessage(SEND_PKG_SIZES, data);
+                msg.setData(data);
+                mHandler.sendMessage(msg);
             }
-            if (DEBUG_SIZE || DEBUG_TIME) Log.i(TAG, "Took "+ (SystemClock.elapsedRealtime() - startTime)+ " ms to compute resources " );
+            if (DEBUG_SIZE || DEBUG_TIME) Log.i(TAG, "Took "+
+                    (SystemClock.elapsedRealtime() - startTime)+
+                    " ms to compute sizes of all packages ");
             mHandler.sendEmptyMessage(END_MSG);
         }
     }
@@ -497,7 +551,7 @@ public class ManageApplications extends ListActivity implements
      * messages.
      */
     private boolean updateAppList(List<ApplicationInfo> newList) {
-        if ((newList == null) || (mAppPropCache == null)) {
+        if ((newList == null) || mCache.isEmpty()) {
             return false;
         }
         Set<String> existingList = new HashSet<String>();
@@ -505,7 +559,7 @@ public class ManageApplications extends ListActivity implements
         // Loop over new list and find out common elements between old and new lists
         for (ApplicationInfo info : newList) {
             String pkgName = info.packageName;
-            AppInfo aInfo = mAppPropCache.get(pkgName);
+            AppInfo aInfo = mCache.getEntry(pkgName);
             if (aInfo != null) {
                 existingList.add(pkgName);
             } else {
@@ -517,7 +571,7 @@ public class ManageApplications extends ListActivity implements
         }
         // Loop over old list and figure out state entries
         List<String> deletedList = null;
-        Set<String> staleList = mAppPropCache.keySet();
+        Set<String> staleList = mCache.getPkgList();
         for (String pkgName : staleList) {
             if (!existingList.contains(pkgName)) {
                 if (localLOGV) Log.i(TAG, "Pkg :"+pkgName+" deleted when paused");
@@ -651,12 +705,8 @@ public class ManageApplications extends ListActivity implements
         ActivityManager am = (ActivityManager)getSystemService(Context.ACTIVITY_SERVICE);
         return am.getRunningAppProcesses();
     }
-    
-    private void initAppList(int filterOption) {
-        initAppList(null, filterOption);
-    }
-    
-     // some initialization code used when kicking off the size computation
+
+     // Some initialization code used when kicking off the size computation
     private void initAppList(List<ApplicationInfo> appList, int filterOption) {
         setProgressBarIndeterminateVisibility(true);
         mComputeSizes = false;
@@ -665,7 +715,7 @@ public class ManageApplications extends ListActivity implements
         mAddRemoveMap = new TreeMap<String, Boolean>();
         mAppInfoAdapter.initMapFromList(appList, filterOption);
     }
-    
+
     // Utility method to start a thread to read application labels and icons
     private void initResourceThread() {
         if ((mResourceThread != null) && mResourceThread.isAlive()) {
@@ -677,7 +727,7 @@ public class ManageApplications extends ListActivity implements
             mResourceThread.loadAllResources(appList);
         }
     }
-    
+
     private void initComputeSizes() {
          // Initiate compute package sizes
         if (localLOGV) Log.i(TAG, "Initiating compute sizes for first time");
@@ -717,6 +767,7 @@ public class ManageApplications extends ListActivity implements
     class ResourceLoaderThread extends Thread {
         List<ApplicationInfo> mAppList;
         volatile boolean abort = false;
+        static final int MSG_PKG_SIZE = 8;
         
         public void setAbort() {
             abort = true;
@@ -735,33 +786,50 @@ public class ManageApplications extends ListActivity implements
             if(mAppList == null || (imax = mAppList.size()) <= 0) {
                 Log.w(TAG, "Empty or null application list");
             } else {
-                for (int i = 0; i < imax; i++) {
-                    if (abort) {
-                        return;
+                int size = mAppList.size();
+                int numMsgs = size / MSG_PKG_SIZE;
+                if (size > (numMsgs * MSG_PKG_SIZE)) {
+                    numMsgs++;
+                }
+                int endi = 0;
+                for (int j = 0; j < size; j += MSG_PKG_SIZE) {
+                    Map<String, CharSequence> map = new HashMap<String, CharSequence>();
+                    endi += MSG_PKG_SIZE;
+                    if (endi > size) {
+                        endi = size;
                     }
-                    ApplicationInfo appInfo = mAppList.get(i);
-                    CharSequence appName = appInfo.loadLabel(mPm);
-                    Message msg = mHandler.obtainMessage(REFRESH_APP_RESOURCE);
-                    msg.obj = new AppInfo(appInfo.packageName, appName, null);
+                    for (int i = j; i < endi; i++) {
+                        if (abort) {
+                            // Exit if abort has been set.
+                            break;
+                        }
+                        ApplicationInfo appInfo = mAppList.get(i);
+                        map.put(appInfo.packageName, appInfo.loadLabel(mPm));
+                    }
+                    // Post update message
+                    Message msg = mHandler.obtainMessage(REFRESH_LABELS);
+                    msg.obj = map;
                     mHandler.sendMessage(msg);
                 }
                 Message doneMsg = mHandler.obtainMessage(REFRESH_DONE);
                 mHandler.sendMessage(doneMsg);
-                if (DEBUG_TIME) Log.i(TAG, "Took "+(SystemClock.elapsedRealtime()-start)+" ms to load app labels");
+                if (DEBUG_TIME) Log.i(TAG, "Took "+(SystemClock.elapsedRealtime()-start)+
+                        " ms to load app labels");
                 long startIcons;
                 if (DEBUG_TIME) {
                     startIcons = SystemClock.elapsedRealtime();
                 }
+                Map<String, Drawable> map = new HashMap<String, Drawable>();
                 for (int i = (imax-1); i >= 0; i--) {
                     if (abort) {
                         return;
                     }
                     ApplicationInfo appInfo = mAppList.get(i);
-                    Drawable appIcon = appInfo.loadIcon(mPm);
-                    Message msg = mHandler.obtainMessage(REFRESH_APP_RESOURCE);
-                    msg.obj = new AppInfo(appInfo.packageName, null, appIcon);
-                    mHandler.sendMessage(msg);
+                    map.put(appInfo.packageName, appInfo.loadIcon(mPm));
                 }
+                Message msg = mHandler.obtainMessage(REFRESH_ICONS);
+                msg.obj = map;
+                mHandler.sendMessage(msg);
                 if (DEBUG_TIME) Log.i(TAG, "Took "+(SystemClock.elapsedRealtime()-startIcons)+" ms to load app icons");
             }
             if (DEBUG_TIME) Log.i(TAG, "Took "+(SystemClock.elapsedRealtime()-start)+" ms to load app resources");
@@ -777,71 +845,64 @@ public class ManageApplications extends ListActivity implements
         public  CharSequence appName;
         public  Drawable appIcon;
         public CharSequence appSize;
-        public PackageStats appStats;
+        long size;
 
-        public void refreshIcon(AppInfo pInfo) {
-            if (pInfo == null) {
+        public void refreshIcon(Drawable icon) {
+            if (icon == null) {
                 return;
             }
-            if (pInfo.appName != null) {
-                appName = pInfo.appName;
-            }
-            if (pInfo.appIcon != null) {
-                appIcon = pInfo.appIcon;
-            }
+            appIcon = icon;
         }
-        public AppInfo(String pName, CharSequence aName, Drawable aIcon) {
-            index = -1;
-            pkgName = pName;
-            appName = aName;
-            appIcon = aIcon;
-            appStats = null;
-            appSize = mComputingSizeStr;
+        public void refreshLabel(CharSequence label) {
+            if (label == null) {
+                return;
+            }
+            appName = label;
         }
-        
-        public AppInfo(String pName, int pIndex, CharSequence aName, Drawable aIcon, 
-                PackageStats ps) {
+
+        public AppInfo(String pName, int pIndex, CharSequence aName,
+                long pSize,
+                CharSequence pSizeStr) {
+            this(pName, pIndex, aName, mDefaultAppIcon, pSize, pSizeStr);
+        }
+ 
+        public AppInfo(String pName, int pIndex, CharSequence aName, Drawable aIcon,
+                long pSize,
+                CharSequence pSizeStr) {
             index = pIndex;
             pkgName = pName;
             appName = aName;
             appIcon = aIcon;
-            if(ps == null) {
-                appSize = mComputingSizeStr;
-            } else {
-                appStats = ps;
-                appSize = getSizeStr();
-            }
-        }
-        public void setSize(PackageStats ps) {
-            appStats = ps;
-            if (ps != null) {
-                appSize = getSizeStr();
+            size = pSize;
+            appSize = pSizeStr;
+        }
+ 
+        public boolean setSize(long newSize, String formattedSize) {
+            if (size != newSize) {
+                size = newSize;
+                appSize = formattedSize;
+                return true;
             }
+            return false;
         }
-        public long getTotalSize() {
-            PackageStats ps = appStats;
-            if (ps != null) {
-                return ps.cacheSize+ps.codeSize+ps.dataSize;
-            }
-            return SIZE_INVALID;
+    }
+    
+    private long getTotalSize(PackageStats ps) {
+        if (ps != null) {
+            return ps.cacheSize+ps.codeSize+ps.dataSize;
         }
-        
-        private String getSizeStr() {
-            PackageStats ps = appStats;
-            String retStr = "";
-            // insert total size information into map to display in view
-            // at this point its guaranteed that ps is not null. but checking anyway
-            if (ps != null) {
-                long size = getTotalSize();
-                if (size == SIZE_INVALID) {
-                    return mInvalidSizeStr.toString();
-                }
-                return Formatter.formatFileSize(ManageApplications.this, size);
-            }
-            return retStr;
+        return SIZE_INVALID;
+    }
+
+    private CharSequence getSizeStr(long size) {
+        CharSequence appSize = null;
+        if (size == SIZE_INVALID) {
+             return mInvalidSizeStr;
         }
+        appSize = Formatter.formatFileSize(ManageApplications.this, size);
+        return appSize;
     }
-    
+
     // View Holder used when displaying views
     static class AppViewHolder {
         TextView appName;
@@ -849,7 +910,8 @@ public class ManageApplications extends ListActivity implements
         TextView appSize;
     }
     
-    /* Custom adapter implementation for the ListView
+    /* 
+     * Custom adapter implementation for the ListView
      * This adapter maintains a map for each displayed application and its properties
      * An index value on each AppInfo object indicates the correct position or index
      * in the list. If the list gets updated dynamically when the user is viewing the list of
@@ -857,57 +919,41 @@ public class ManageApplications extends ListActivity implements
      * the getId methods via the package name into the internal maps and indices.
      * The order of applications in the list is mirrored in mAppLocalList
      */
-    class AppInfoAdapter extends BaseAdapter {
-        private Map<String, AppInfo> mAppPropMap;
+    class AppInfoAdapter extends BaseAdapter {        
         private List<ApplicationInfo> mAppList;
         private List<ApplicationInfo> mAppLocalList;
-        ApplicationInfo.DisplayNameComparator mAlphaComparator;
-        AppInfoComparator mSizeComparator;
-        
-        private AppInfo getFromCache(String packageName) {
-            if(mAppPropCache == null) {
-                return null;
-            }
-            return mAppPropCache.get(packageName);
-        }
+        AlphaComparator mAlphaComparator = new AlphaComparator();
+        SizeComparator mSizeComparator = new SizeComparator();
 
         // Make sure the cache or map contains entries for all elements
         // in appList for a valid sort.
-        public void initMapFromList(List<ApplicationInfo> appList, int filterOption) {
-            if (appList == null) {
+        public void initMapFromList(List<ApplicationInfo> pAppList, int filterOption) {
+            boolean notify = false;
+            List<ApplicationInfo> appList = null;
+            if (pAppList == null) {
                 // Just refresh the list
                 appList = mAppList;
             } else {
-                mAppList = appList;
-            }
-            if (mAppPropCache != null) {
-                // Retain previous sort order
-                int sortOrder = mSortOrder;
-                mAppPropMap = mAppPropCache;
-                // TODO is this required?
-                sortAppList(mAppList, sortOrder);
-            } else {
-                // Recreate property map
-                mAppPropMap = new TreeMap<String, AppInfo>();
+                mAppList = pAppList;
+                appList = pAppList;
+                notify = true;
             }
-            // Re init the comparators
-            mAlphaComparator = null;
-            mSizeComparator = null;
-
             mAppLocalList = getFilteredApps(appList, filterOption);
+            // This loop verifies and creates new entries for new packages in list
             int imax = appList.size();
             for (int i = 0; i < imax; i++) {
                 ApplicationInfo info  = appList.get(i);
-                AppInfo aInfo = mAppPropMap.get(info.packageName);
+                AppInfo aInfo = mCache.getEntry(info.packageName);
                 if(aInfo == null){
                     aInfo = new AppInfo(info.packageName, i, 
-                            info.packageName, mDefaultAppIcon, null);
+                            info.packageName, -1, mComputingSizeStr);
                     if (localLOGV) Log.i(TAG, "Creating entry pkg:"+info.packageName+" to map");
-                } else {
-                    aInfo.index = i;
-                    if (localLOGV) Log.i(TAG, "Adding pkg:"+info.packageName+" to map");
+                    mCache.addEntry(aInfo);
                 }
-                mAppPropMap.put(info.packageName, aInfo);
+            }
+            sortListInner(mSortOrder);
+            if (notify) {
+                notifyDataSetChanged();
             }
         }
         
@@ -956,7 +1002,11 @@ public class ManageApplications extends ListActivity implements
                 Log.w(TAG, "Position out of bounds in List Adapter");
                 return -1;
             }
-            return mAppPropMap.get(mAppLocalList.get(position).packageName).index;
+            AppInfo aInfo = mCache.getEntry(mAppLocalList.get(position).packageName);
+            if (aInfo == null) {
+                return -1;
+            }
+            return aInfo.index;
         }
         
         public List<ApplicationInfo> getBaseAppList() {
@@ -993,7 +1043,7 @@ public class ManageApplications extends ListActivity implements
 
             // Bind the data efficiently with the holder
             ApplicationInfo appInfo = mAppLocalList.get(position);
-            AppInfo mInfo = mAppPropMap.get(appInfo.packageName);
+            AppInfo mInfo = mCache.getEntry(appInfo.packageName);
             if(mInfo != null) {
                 if(mInfo.appName != null) {
                     holder.appName.setText(mInfo.appName);
@@ -1014,7 +1064,7 @@ public class ManageApplications extends ListActivity implements
             int imax = mAppLocalList.size();
             for (int i = 0; i < imax; i++) {
                 ApplicationInfo info = mAppLocalList.get(i);
-                mAppPropMap.get(info.packageName).index = i;
+                mCache.getEntry(info.packageName).index = i;
             }
         }
         
@@ -1028,11 +1078,15 @@ public class ManageApplications extends ListActivity implements
             mAppLocalList = getFilteredApps(mAppList, mFilterApps);
             adjustIndex();
         }
+
+        private void sortListInner(int sortOrder) {
+            sortAppList(mAppLocalList, sortOrder);
+            adjustIndex(); 
+        }
         
         public void sortList(int sortOrder) {
             if (localLOGV) Log.i(TAG, "sortOrder = "+sortOrder);
-            sortAppList(mAppLocalList, sortOrder);
-            adjustIndex();
+            sortListInner(sortOrder);
             notifyDataSetChanged();
         }
         
@@ -1047,14 +1101,9 @@ public class ManageApplications extends ListActivity implements
            mAppLocalList = getFilteredApps(mAppList, filterOption);
            // Check for all properties in map before sorting. Populate values from cache
            for(ApplicationInfo applicationInfo : mAppLocalList) {
-               AppInfo appInfo = mAppPropMap.get(applicationInfo.packageName);
+               AppInfo appInfo = mCache.getEntry(applicationInfo.packageName);
                if(appInfo == null) {
-                   AppInfo rInfo = getFromCache(applicationInfo.packageName);
-                   if(rInfo == null) {
-                       // Need to load resources again. Inconsistency somewhere          
-                       return false;
-                   }
-                   mAppPropMap.put(applicationInfo.packageName, rInfo);
+                  Log.i(TAG, " Entry does not exist for pkg:  " + applicationInfo.packageName);
                }
            }
            if (mAppLocalList.size() > 0) {
@@ -1068,33 +1117,64 @@ public class ManageApplications extends ListActivity implements
         
         private Comparator<ApplicationInfo> getAppComparator(int sortOrder) {
             if (sortOrder == SORT_ORDER_ALPHA) {
-                // Lazy initialization
-                if (mAlphaComparator == null) {
-                    mAlphaComparator = new ApplicationInfo.DisplayNameComparator(mPm);
-                }
                 return mAlphaComparator;
             }
-            // Lazy initialization
-            if(mSizeComparator == null) {
-                mSizeComparator = new AppInfoComparator(mAppPropMap);
-            }
             return mSizeComparator;
         }
         
-        public boolean updateAppsResourceInfo(AppInfo pInfo) {
-            if((pInfo == null) || (pInfo.pkgName == null)) {
-                Log.w(TAG, "Null info when refreshing icon in List Adapter");
+        public void bulkUpdateIcons(Map<String, Drawable> icons) {
+            if (icons == null) {
+                return;
+            }
+            Set<String> keys = icons.keySet();
+            boolean changed = false;
+            for (String key : keys) {
+                Drawable ic = icons.get(key);
+                if (ic != null) {
+                    AppInfo aInfo = mCache.getEntry(key);
+                    if (aInfo != null) {
+                        aInfo.refreshIcon(ic);
+                        changed = true;
+                    }
+                }
+            }
+            if (changed) {
+                notifyDataSetChanged();
+            }
+        }
+
+        public void bulkUpdateLabels(Map<String, CharSequence> map) {
+            if (map == null) {
+                return;
+            }
+            Set<String> keys = map.keySet();
+            boolean changed = false;
+            for (String key : keys) {
+                CharSequence label = map.get(key);
+                AppInfo aInfo = mCache.getEntry(key);
+                if (aInfo != null) {
+                    aInfo.refreshLabel(label);
+                    changed = true;
+                }
+            }
+            if (changed) {
+                notifyDataSetChanged();
+            }
+        }
+
+        public boolean updateAppLabel(String pkgName, CharSequence label) {
+            if ((pkgName == null) || (label == null)) {
                 return false;
             }
-            AppInfo aInfo = mAppPropMap.get(pInfo.pkgName);
+            AppInfo aInfo = mCache.getEntry(pkgName);
             if (aInfo != null) {
-                aInfo.refreshIcon(pInfo);
+                aInfo.refreshLabel(label);
                 notifyDataSetChanged();
                 return true;
             }
             return false;
         }
-        
+
         private boolean shouldBeInList(int filterOption, ApplicationInfo info) {
             // Match filter here
             if (filterOption == FILTER_APPS_RUNNING) {
@@ -1123,13 +1203,8 @@ public class ManageApplications extends ListActivity implements
          * @param pkgName name of package to be added
          * @param ps PackageStats of new package
          */
-        public void addToList(String pkgName, PackageStats ps) {
-            if((pkgName == null) || (ps == null)) {
-                if (pkgName == null) {
-                    Log.w(TAG, "Adding null pkg to List Adapter");
-                } else {
-                    Log.w(TAG, "Adding pkg : "+pkgName+" with invalid PackageStats");
-                }
+        public void addToList(String pkgName, long size, String formattedSize) {
+            if (pkgName == null) {
                 return;
             }
             boolean notInList = true;
@@ -1150,8 +1225,8 @@ public class ManageApplications extends ListActivity implements
             mAppList.add(info);
             // Add entry to map. Note that the index gets adjusted later on based on
             // whether the newly added package is part of displayed list
-            mAppPropMap.put(pkgName, new AppInfo(pkgName, -1,
-                    info.loadLabel(mPm), info.loadIcon(mPm), ps));
+            mCache.addEntry(new AppInfo(pkgName, -1,
+                    info.loadLabel(mPm), info.loadIcon(mPm), size, formattedSize));
             // Add to list
             if (notInList && (shouldBeInList(mFilterApps, info))) {
                 // Binary search returns a negative index (ie -index) of the position where
@@ -1170,13 +1245,7 @@ public class ManageApplications extends ListActivity implements
                 notifyDataSetChanged();
             }
         }
-        
-        private void removePkgListBase(List<String> pkgNames) {
-            for (String pkg : pkgNames) {
-                removePkgBase(pkg);
-            }
-        }
-        
+
         private void removePkgBase(String pkgName) {
             int imax = mAppList.size();
             for (int i = 0; i < imax; i++) {
@@ -1188,80 +1257,74 @@ public class ManageApplications extends ListActivity implements
                 }
             }
         }
-        
+ 
         public void removeFromList(List<String> pkgNames) {
             if(pkgNames == null) {
-                Log.w(TAG, "Removing null pkg list from List Adapter");
                 return;
             }
-            removePkgListBase(pkgNames);
-            int imax = mAppLocalList.size();
-            boolean found = false;
-            ApplicationInfo info;
-            int i, k;
-            String pkgName;
-            int kmax = pkgNames.size();
-            if(kmax  <= 0) {
-                Log.w(TAG, "Removing empty pkg list from List Adapter");
+            if(pkgNames.size()  <= 0) {
                 return;
             }
-            int idxArr[] = new int[kmax];
-            for (k = 0; k < kmax; k++) {
-                idxArr[k] = -1;
-            }
-            for (i = 0; i < imax; i++) {
-                info = mAppLocalList.get(i);
-                for (k = 0; k < kmax; k++) {
-                    pkgName = pkgNames.get(k);
-                    if (info.packageName.equalsIgnoreCase(pkgName)) {
-                        idxArr[k] = i;
+            boolean found = false;
+            for (String pkg : pkgNames) {
+                // Remove from the base application list
+                removePkgBase(pkg);
+                // Remove from cache
+                if (localLOGV) Log.i(TAG, "Removing " + pkg + " from cache");
+                mCache.removeEntry(pkg);
+                // Remove from filtered list
+                int i = 0;
+                for (ApplicationInfo info : mAppLocalList) {
+                    if (info.packageName.equalsIgnoreCase(pkg)) {
+                        mAppLocalList.remove(i);
+                        if (localLOGV) Log.i(TAG, "Removing " + pkg + " from local list");
                         found = true;
                         break;
                     }
+                    i++;
                 }
             }
-            // Sort idxArr
-            Arrays.sort(idxArr);
-            // remove the packages based on descending indices
-            for (k = kmax-1; k >= 0; k--) {
-                // Check if package has been found in the list of existing apps first
-                if(idxArr[k] == -1) {
-                    break;
-                }
-                info = mAppLocalList.get(idxArr[k]);
-                mAppLocalList.remove(idxArr[k]);
-                mAppPropMap.remove(info.packageName);
-                if (localLOGV) Log.i(TAG, "Removed pkg:"+info.packageName+ " from display list");
-            }
+            // Adjust indices of list entries
             if (found) {
                 adjustIndex();
+                if (localLOGV) Log.i(TAG, "adjusting index and notifying list view");
+                notifyDataSetChanged();
+            }
+        }
+
+        public void bulkUpdateSizes(String pkgs[], long sizes[], String formatted[]) {
+            if(pkgs == null || sizes == null || formatted == null) {
+                return;
+            }
+            boolean changed = false;
+            for (int i = 0; i < pkgs.length; i++) {
+                AppInfo entry = mCache.getEntry(pkgs[i]);
+                if (entry == null) {
+                    Log.w(TAG, "Entry for package:"+ pkgs[i] +"doesn't exist in map");
+                    continue;
+                }
+                if (entry.setSize(sizes[i], formatted[i])) {
+                    changed = true;
+                }
+            }
+            if (changed) {
                 notifyDataSetChanged();
             }
         }
         
-        public void updateAppSize(String pkgName, PackageStats ps) {
+        public void updateAppSize(String pkgName, long size, String formattedSize) {
             if(pkgName == null) {
                 return;
             }
-            AppInfo entry = mAppPropMap.get(pkgName);
+            AppInfo entry = mCache.getEntry(pkgName);
             if (entry == null) {
                 Log.w(TAG, "Entry for package:"+pkgName+"doesnt exist in map");
                 return;
             }
             // Copy the index into the newly updated entry
-            entry.setSize(ps);
-            notifyDataSetChanged();
-        }
-
-        public PackageStats getAppStats(String pkgName) {
-            if(pkgName == null) {
-                return null;
-            }
-            AppInfo entry = mAppPropMap.get(pkgName);
-            if (entry == null) {
-                return null;
+            if (entry.setSize(size, formattedSize)) {
+                notifyDataSetChanged();
             }
-            return entry.appStats;
         }
     }
     
@@ -1273,12 +1336,12 @@ public class ManageApplications extends ListActivity implements
      */
     private void clearMessagesInHandler() {
         mHandler.removeMessages(INIT_PKG_INFO);
-        mHandler.removeMessages(COMPUTE_PKG_SIZE_DONE);
+        mHandler.removeMessages(COMPUTE_BULK_SIZE);
         mHandler.removeMessages(REMOVE_PKG);
         mHandler.removeMessages(REORDER_LIST);
         mHandler.removeMessages(ADD_PKG_START);
         mHandler.removeMessages(ADD_PKG_DONE);
-        mHandler.removeMessages(REFRESH_APP_RESOURCE);
+        mHandler.removeMessages(REFRESH_LABELS);
         mHandler.removeMessages(REFRESH_DONE);
         mHandler.removeMessages(NEXT_LOAD_STEP);
         mHandler.removeMessages(COMPUTE_END);
@@ -1309,7 +1372,6 @@ public class ManageApplications extends ListActivity implements
      */
     class PkgSizeObserver extends IPackageStatsObserver.Stub {
         private ApplicationInfo mAppInfo;
-        private int mMsgId; 
         public void onGetStatsCompleted(PackageStats pStats, boolean pSucceeded) {
             if(DEBUG_PKG_DELAY) {
                 try {
@@ -1320,27 +1382,30 @@ public class ManageApplications extends ListActivity implements
             AppInfo appInfo = null;
             Bundle data = new Bundle();
             data.putString(ATTR_PKG_NAME, mAppInfo.packageName);
+            data.putBoolean(ATTR_GET_SIZE_STATUS, pSucceeded);
             if(pSucceeded && pStats != null) {
                 if (localLOGV) Log.i(TAG, "onGetStatsCompleted::"+pStats.packageName+", ("+
                         pStats.cacheSize+","+
                         pStats.codeSize+", "+pStats.dataSize);
-                data.putParcelable(ATTR_APP_PKG_STATS, pStats);
+                long total = getTotalSize(pStats);
+                data.putLong(ATTR_PKG_STATS, total);
+                CharSequence sizeStr = getSizeStr(total);
+                data.putString(ATTR_PKG_SIZE_STR, sizeStr.toString());
             } else {
                 Log.w(TAG, "Invalid package stats from PackageManager");
             }
-            //post message to Handler
-            Message msg = mHandler.obtainMessage(mMsgId, data);
+            // Post message to Handler
+            Message msg = mHandler.obtainMessage(ADD_PKG_DONE, data);
             msg.setData(data);
             mHandler.sendMessage(msg);
         }
 
-        public void invokeGetSizeInfo(ApplicationInfo pAppInfo, int msgId) {
+        public void invokeGetSizeInfo(ApplicationInfo pAppInfo) {
             if(pAppInfo == null || pAppInfo.packageName == null) {
                 return;
             }
             if(localLOGV) Log.i(TAG, "Invoking getPackageSizeInfo for package:"+
                     pAppInfo.packageName);
-            mMsgId = msgId;
             mAppInfo = pAppInfo;
             mPm.getPackageSizeInfo(pAppInfo.packageName, this);
         }
@@ -1380,11 +1445,15 @@ public class ManageApplications extends ListActivity implements
             sendMessageToHandler(REMOVE_PKG, data);
         }
     }
-    
-    
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if(localLOGV) Log.i(TAG, "Activity created");
+        long sCreate;
+        if (DEBUG_TIME) {
+            sCreate = SystemClock.elapsedRealtime();
+        }
         Intent intent = getIntent();
         String action = intent.getAction();
         if (action.equals(Intent.ACTION_MANAGE_PACKAGE_STORAGE)) {
@@ -1416,8 +1485,27 @@ public class ManageApplications extends ListActivity implements
         lv.setItemsCanFocus(true);
         lv.setOnItemClickListener(this);
         mListView = lv;
+        if (DEBUG_TIME) {
+            Log.i(TAG, "Total time in Activity.create:: " +
+                    (SystemClock.elapsedRealtime() - sCreate)+ " ms");
+        }
+        // Get initial info from file for the very first time this activity started
+        long sStart;
+        if (DEBUG_TIME) {
+            sStart = SystemClock.elapsedRealtime();
+        }
+        mCache.loadCache();
+        if (DEBUG_TIME) {
+            Log.i(TAG, "Took " + (SystemClock.elapsedRealtime()-sStart) + " ms to init cache");
+        }
     }
     
+    protected void onDestroy() {
+        // Persist values in cache
+        mCache.updateCache();
+        super.onDestroy();
+    }
+
     @Override
     public Dialog onCreateDialog(int id) {
         if (id == DLG_LOADING) {
@@ -1430,8 +1518,7 @@ public class ManageApplications extends ListActivity implements
         }
         return null;
     }
-    
-    
+
     private void showLoadingMsg() {
         if (DEBUG_TIME) {
             mLoadTimeStart = SystemClock.elapsedRealtime();
@@ -1444,13 +1531,179 @@ public class ManageApplications extends ListActivity implements
         if(localLOGV) Log.i(TAG, "Dismissing Loading message");
         dismissDialog(DLG_LOADING);
         if (DEBUG_TIME) Log.i(TAG, "Displayed loading message for "+
-                (SystemClock.elapsedRealtime() - mLoadTimeStart));
+                (SystemClock.elapsedRealtime() - mLoadTimeStart) + " ms");
     }
-    
+
+    class AppInfoCache {
+        final static boolean FILE_CACHE = true;
+        private static final String mFileCacheName="ManageAppsInfo.txt";
+        private static final int FILE_BUFFER_SIZE = 1024;
+        private static final boolean DEBUG_CACHE = false;
+        private static final boolean DEBUG_CACHE_TIME = true;
+        private Map<String, AppInfo> mAppPropCache = new HashMap<String, AppInfo>();
+
+        private boolean isEmpty() {
+            return (mAppPropCache.size() == 0);
+        }
+
+        private AppInfo getEntry(String pkgName) {
+            return mAppPropCache.get(pkgName);
+        }
+
+        private Set<String> getPkgList() {
+            return mAppPropCache.keySet();
+        }
+
+        public void addEntry(AppInfo aInfo) {
+            if ((aInfo != null) && (aInfo.pkgName != null)) {
+                mAppPropCache.put(aInfo.pkgName, aInfo);
+            }
+        }
+
+        public void removeEntry(String pkgName) {
+            if (pkgName != null) {
+                mAppPropCache.remove(pkgName);
+            }
+        }
+
+        private void readFromFile() {
+            File cacheFile = new File(getFilesDir(), mFileCacheName);
+            if (!cacheFile.exists()) {
+                return;
+            }
+            FileInputStream fis = null;
+            boolean err = false;
+            try {
+                fis = new FileInputStream(cacheFile);
+            } catch (FileNotFoundException e) {
+                Log.w(TAG, "Error opening file for read operation : " + cacheFile
+                        + " with exception " + e);
+                return;
+            }
+            try {
+                byte[] byteBuff = new byte[FILE_BUFFER_SIZE];
+                byte[] lenBytes = new byte[2];
+                mAppPropCache.clear();
+                while(fis.available() > 0) {
+                    fis.read(lenBytes, 0, 2);
+                    int buffLen = (lenBytes[0] << 8) | lenBytes[1];
+                    // Buffer length cannot be great then max.
+                    fis.read(byteBuff, 0, buffLen);
+                    String buffStr = new String(byteBuff);
+                    if (DEBUG_CACHE) {
+                        Log.i(TAG, "Read string of len= " + buffLen + " :: " + buffStr + " from file");
+                    }
+                    // Parse string for sizes
+                    String substrs[] = buffStr.split(",");
+                    if (substrs.length < 4) {
+                        // Something wrong. Bail out and let recomputation proceed.
+                        err = true;
+                        break;
+                    }
+                    long size = -1;
+                    int idx = -1;
+                    try {
+                        size = Long.parseLong(substrs[1]);
+                    } catch (NumberFormatException e) {
+                        err = true;
+                        break;
+                    }
+                    if (DEBUG_CACHE) {
+                        Log.i(TAG, "Creating entry(" + substrs[0] + ", " + idx+"," + size + ", " + substrs[2] + ")");
+                    }
+                    AppInfo aInfo = new AppInfo(substrs[0], idx, substrs[3], size, substrs[2]);
+                    mAppPropCache.put(aInfo.pkgName, aInfo);
+                }
+            } catch (IOException e) {
+                Log.w(TAG, "Failed reading from file : " + cacheFile + " with exception : " + e);
+                err = true;
+            } finally {
+                if (fis != null) {
+                    try {
+                        fis.close();
+                    } catch (IOException e) {
+                        Log.w(TAG, "Failed to close file " + cacheFile + " with exception : " +e);
+                    }
+                }
+            }
+            if (err) {
+                Log.i(TAG, "Failed to load cache. Not using cache for now.");
+                // Clear cache and bail out
+                mAppPropCache.clear();
+            }
+        }
+
+        void writeToFile() {
+            File cacheFile = new File(getFilesDir(), mFileCacheName);
+            FileOutputStream fos = null;
+            try {
+                long opStartTime = SystemClock.uptimeMillis();
+                fos = new FileOutputStream(cacheFile);
+                Set<String> keys = mAppPropCache.keySet();
+                byte[] lenBytes = new byte[2];
+                for (String key : keys) {
+                    AppInfo aInfo = mAppPropCache.get(key);
+                    StringBuilder buff = new StringBuilder(aInfo.pkgName);
+                    buff.append(",");
+                    buff.append(aInfo.size);
+                    buff.append(",");
+                    buff.append(aInfo.appSize);
+                    buff.append(",");
+                    buff.append(aInfo.appName);
+                    if (DEBUG_CACHE) {
+                        Log.i(TAG, "Writing str : " + buff.toString() + " to file of length:" +
+                                buff.toString().length());
+                    }
+                    try {
+                        byte[] byteBuff = buff.toString().getBytes();
+                        int len = byteBuff.length;
+                        if (byteBuff.length >= FILE_BUFFER_SIZE) {
+                            // Truncate the output
+                            len = FILE_BUFFER_SIZE;
+                        }
+                        // Use 2 bytes to write length
+                        lenBytes[1] = (byte) (len & 0x00ff);
+                        lenBytes[0] = (byte) ((len & 0x00ff00) >> 8);
+                        fos.write(lenBytes, 0, 2);
+                        fos.write(byteBuff, 0, len);
+                    } catch (IOException e) {
+                        Log.w(TAG, "Failed to write to file : " + cacheFile + " with exception : " + e);
+                    }
+                }
+                if (DEBUG_CACHE_TIME) {
+                    Log.i(TAG, "Took " + (SystemClock.uptimeMillis() - opStartTime) + " ms to write and process from file");
+                }
+            } catch (FileNotFoundException e) {
+                Log.w(TAG, "Error opening file for write operation : " + cacheFile+
+                        " with exception : " + e);
+            } finally {
+                if (fos != null) {
+                    try {
+                        fos.close();
+                    } catch (IOException e) {
+                        Log.w(TAG, "Failed closing file : " + cacheFile + " with exception : " + e);
+                    }
+                }
+            }
+        }
+        private void loadCache() {
+            if (FILE_CACHE) {
+                readFromFile();
+            }
+        }
+
+        private void updateCache() {
+            if (FILE_CACHE) {
+                writeToFile();
+                mAppPropCache.clear();
+            }
+        }
+    }
+
     @Override
     public void onStart() {
         super.onStart();
-        // register receiver
+        // Register receiver
         mReceiver.registerReceiver();
         sendMessageToHandler(INIT_PKG_INFO);
     }
@@ -1468,8 +1721,7 @@ public class ManageApplications extends ListActivity implements
         // clear all messages related to application list
         clearMessagesInHandler();
         // register receiver here
-        unregisterReceiver(mReceiver);        
-        mAppPropCache = mAppInfoAdapter.mAppPropMap;
+        unregisterReceiver(mReceiver);
     }
     
     // Avoid the restart and pause when orientation changes
@@ -1481,16 +1733,12 @@ public class ManageApplications extends ListActivity implements
     /*
      * comparator class used to sort AppInfo objects based on size
      */
-    public static class AppInfoComparator implements Comparator<ApplicationInfo> {
-        public AppInfoComparator(Map<String, AppInfo> pAppPropMap) {
-            mAppPropMap= pAppPropMap;
-        }
-
+    class SizeComparator implements Comparator<ApplicationInfo> {
         public final int compare(ApplicationInfo a, ApplicationInfo b) {
-            AppInfo ainfo = mAppPropMap.get(a.packageName);
-            AppInfo binfo = mAppPropMap.get(b.packageName);
-            long atotal = ainfo.getTotalSize();
-            long btotal = binfo.getTotalSize();
+            AppInfo ainfo = mCache.getEntry(a.packageName);
+            AppInfo binfo = mCache.getEntry(b.packageName);
+            long atotal = ainfo.size;
+            long btotal = binfo.size;
             long ret = atotal - btotal;
             // negate result to sort in descending order
             if (ret < 0) {
@@ -1501,9 +1749,22 @@ public class ManageApplications extends ListActivity implements
             }
             return -1;
         }
-        private Map<String, AppInfo> mAppPropMap;
     }
-     
+
+    /*
+     * Customized comparator class to compare labels.
+     * Don't use the one defined in ApplicationInfo since that loads the labels again.
+     */
+    class AlphaComparator implements Comparator<ApplicationInfo> {
+        private final Collator   sCollator = Collator.getInstance();
+
+        public final int compare(ApplicationInfo a, ApplicationInfo b) {
+            AppInfo ainfo = mCache.getEntry(a.packageName);
+            AppInfo binfo = mCache.getEntry(b.packageName);
+            return sCollator.compare(ainfo.appName.toString(), binfo.appName.toString());
+        }
+    }
+
     // utility method used to start sub activity
     private void startApplicationDetailsActivity() {
         // Create intent to start new activity
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 73578c7..63d88d3 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -37,6 +37,7 @@ import android.preference.PreferenceCategory;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
+import android.security.CertTool;
 import android.security.Keystore;
 import android.text.Html;
 import android.text.TextUtils;
@@ -150,9 +151,10 @@ public class SecuritySettings extends PreferenceActivity implements
                 null);
         mContentQueryMap = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, null);
         mContentQueryMap.addObserver(new SettingsObserver());
-        boolean doneUseLocation = savedInstanceState != null
-                && savedInstanceState.getBoolean(KEY_DONE_USE_LOCATION, true);
-        if (getIntent().getBooleanExtra("SHOW_USE_LOCATION", false) && !doneUseLocation) {
+        boolean doneUseLocation = savedInstanceState == null
+                ? false : savedInstanceState.getBoolean(KEY_DONE_USE_LOCATION, true);
+        if (!doneUseLocation && (getIntent().getBooleanExtra("SHOW_USE_LOCATION", false)
+                || savedInstanceState != null)) {
             showUseLocationDialog(true);
         }
 
@@ -261,12 +263,12 @@ public class SecuritySettings extends PreferenceActivity implements
     }
 
     @Override
-    public void onPause() {
+    public void onStop() {
         if (mUseLocationDialog != null && mUseLocationDialog.isShowing()) {
             mUseLocationDialog.dismiss();
         }
         mUseLocationDialog = null;
-        super.onPause();
+        super.onStop();
     }
 
     @Override
@@ -442,8 +444,9 @@ public class SecuritySettings extends PreferenceActivity implements
         }
     }
 
-    private class CstorHelper implements
-            DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+    private class CstorHelper implements DialogInterface.OnClickListener,
+            DialogInterface.OnDismissListener,
+            DialogInterface.OnCancelListener {
         private Keystore mKeystore = Keystore.getInstance();
         private View mView;
         private int mDialogId;
@@ -513,19 +516,18 @@ public class SecuritySettings extends PreferenceActivity implements
             mAccessCheckBox.setChecked(false);
         }
 
-        private void addCredential() {
-            String formatString = mCstorAddCredentialHelper.saveToStorage() < 0
-                    ? getString(R.string.cstor_add_error)
-                    : getString(R.string.cstor_is_added);
-            String message = String.format(formatString,
-                    mCstorAddCredentialHelper.getName());
-            Toast.makeText(SecuritySettings.this, message, Toast.LENGTH_SHORT)
-                    .show();
+        public void onCancel(DialogInterface dialog) {
+            if (mCstorAddCredentialHelper != null) {
+                // release the object here so that it doesn't get triggerred in
+                // onDismiss()
+                mCstorAddCredentialHelper = null;
+                finish();
+            }
         }
 
         public void onClick(DialogInterface dialog, int which) {
             if (which == DialogInterface.BUTTON_NEGATIVE) {
-                if (mCstorAddCredentialHelper != null) finish();
+                onCancel(dialog);
                 return;
             }
 
@@ -556,13 +558,22 @@ public class SecuritySettings extends PreferenceActivity implements
             } else {
                 removeDialog(mDialogId);
 
+                if (mDialogId == CSTOR_UNLOCK_DIALOG) {
+                    mAccessCheckBox.setChecked(isCstorUnlocked());
+                }
+
                 if (mCstorAddCredentialHelper != null) {
                     if (!isCstorInitialized()) {
                         showDialog(CSTOR_INIT_DIALOG);
                     } else if (!isCstorUnlocked()) {
                         showDialog(CSTOR_UNLOCK_DIALOG);
                     } else {
-                        addCredential();
+                        String formatString =
+                                getString(R.string.cstor_is_added);
+                        String message = String.format(formatString,
+                                mCstorAddCredentialHelper.getName());
+                        Toast.makeText(SecuritySettings.this, message,
+                                Toast.LENGTH_SHORT).show();
                         finish();
                     }
                 } else if (mSpecialIntent != null) {
@@ -603,6 +614,26 @@ public class SecuritySettings extends PreferenceActivity implements
             }
 
             mCstorAddCredentialHelper.setName(name);
+
+            if (mCstorAddCredentialHelper.isPkcs12Keystore()) {
+                String password = getText(R.id.cstor_credential_password);
+                if (TextUtils.isEmpty(password)) {
+                    showError(R.string.cstor_password_empty_error);
+                    return false;
+                }
+
+                mCstorAddCredentialHelper.setPassword(password);
+            }
+
+            if (mCstorAddCredentialHelper.saveToStorage() < 0) {
+                if (mCstorAddCredentialHelper.isPkcs12Keystore()) {
+                    showError(R.string.cstor_password_error);
+                } else {
+                    showError(R.string.cstor_storage_error);
+                }
+                return false;
+            }
+
             return true;
         }
 
@@ -792,7 +823,7 @@ public class SecuritySettings extends PreferenceActivity implements
                     .setTitle(R.string.cstor_access_dialog_title)
                     .setPositiveButton(android.R.string.ok, this)
                     .setNegativeButton(android.R.string.cancel, this)
-                    .setCancelable(false)
+                    .setOnCancelListener(this)
                     .create();
             d.setOnDismissListener(this);
             return d;
@@ -832,7 +863,7 @@ public class SecuritySettings extends PreferenceActivity implements
                     .setTitle(R.string.cstor_set_passwd_dialog_title)
                     .setPositiveButton(android.R.string.ok, this)
                     .setNegativeButton(android.R.string.cancel, this)
-                    .setCancelable(false)
+                    .setOnCancelListener(this)
                     .create();
             d.setOnDismissListener(this);
             return d;
@@ -854,6 +885,9 @@ public class SecuritySettings extends PreferenceActivity implements
             mView = View.inflate(SecuritySettings.this,
                     R.layout.cstor_name_credential_dialog_view, null);
             hideError();
+            if (!mCstorAddCredentialHelper.isPkcs12Keystore()) {
+                hide(R.id.cstor_credential_password_container);
+            }
 
             setText(R.id.cstor_credential_name_title,
                     R.string.cstor_credential_name);
@@ -867,7 +901,7 @@ public class SecuritySettings extends PreferenceActivity implements
                     .setTitle(R.string.cstor_name_credential_dialog_title)
                     .setPositiveButton(android.R.string.ok, this)
                     .setNegativeButton(android.R.string.cancel, this)
-                    .setCancelable(false)
+                    .setOnCancelListener(this)
                     .create();
             d.setOnDismissListener(this);
             return d;
@@ -880,6 +914,7 @@ public class SecuritySettings extends PreferenceActivity implements
         private List<String> mNamespaceList;
         private String mDescription;
         private String mName;
+        private String mPassword;
 
         CstorAddCredentialHelper(Intent intent) {
             parse(intent);
@@ -889,6 +924,10 @@ public class SecuritySettings extends PreferenceActivity implements
             return mTypeName;
         }
 
+        boolean isPkcs12Keystore() {
+            return CertTool.TITLE_PKCS12_KEYSTORE.equals(mTypeName);
+        }
+
         CharSequence getDescription() {
             return Html.fromHtml(mDescription);
         }
@@ -901,12 +940,26 @@ public class SecuritySettings extends PreferenceActivity implements
             return mName;
         }
 
+        void setPassword(String password) {
+            mPassword = password;
+        }
+
+        String getPassword() {
+            return mPassword;
+        }
+
         int saveToStorage() {
-            Keystore ks = Keystore.getInstance();
-            for (int i = 0, count = mItemList.size(); i < count; i++) {
-                byte[] blob = mItemList.get(i);
-                int ret = ks.put(mNamespaceList.get(i), mName, new String(blob));
-                if (ret < 0) return ret;
+            if (isPkcs12Keystore()) {
+                return CertTool.getInstance().addPkcs12Keystore(
+                        mItemList.get(0), mPassword, mName);
+            } else {
+                Keystore ks = Keystore.getInstance();
+                for (int i = 0, count = mItemList.size(); i < count; i++) {
+                    byte[] blob = mItemList.get(i);
+                    int ret = ks.put(mNamespaceList.get(i), mName,
+                            new String(blob));
+                    if (ret < 0) return ret;
+                }
             }
             return 0;
         }
diff --git a/src/com/android/settings/SoundAndDisplaySettings.java b/src/com/android/settings/SoundAndDisplaySettings.java
index 8e7411c..4417f24 100644
--- a/src/com/android/settings/SoundAndDisplaySettings.java
+++ b/src/com/android/settings/SoundAndDisplaySettings.java
@@ -55,7 +55,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
     private static final String KEY_ANIMATIONS = "animations";
     private static final String KEY_ACCELEROMETER = "accelerometer";
     private static final String KEY_PLAY_MEDIA_NOTIFICATION_SOUNDS = "play_media_notification_sounds";
-    private static final String KEY_COMPATIBILITY_MODE = "compatibility_mode";
     private static final String KEY_EMERGENCY_TONE ="emergency_tone";
     
     private CheckBoxPreference mSilent;
@@ -76,7 +75,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
     private CheckBoxPreference mSoundEffects;
     private CheckBoxPreference mAnimations;
     private CheckBoxPreference mAccelerometer;
-    private CheckBoxPreference mCompatibilityMode;
     private float[] mAnimationScales;
     
     private AudioManager mAudioManager;
@@ -124,10 +122,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
         mAnimations.setPersistent(false);
         mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
         mAccelerometer.setPersistent(false);
-        mCompatibilityMode = (CheckBoxPreference) findPreference(KEY_COMPATIBILITY_MODE);
-        mCompatibilityMode.setPersistent(false);
-        mCompatibilityMode.setChecked(Settings.System.getInt(resolver,
-                Settings.System.COMPATIBILITY_MODE, 1) != 0);
         
         ListPreference screenTimeoutPreference =
             (ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
@@ -269,10 +263,6 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
             Settings.System.putInt(getContentResolver(),
                     Settings.System.ACCELEROMETER_ROTATION,
                     mAccelerometer.isChecked() ? 1 : 0);
-        } else if (preference == mCompatibilityMode) {
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.COMPATIBILITY_MODE,
-                    mCompatibilityMode.isChecked() ? 1 : 0);
         }
         return true;
     }
diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java
index 88bfc67..789368a 100644
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -58,8 +58,8 @@ public class TextToSpeechSettings extends PreferenceActivity implements
 
     private static final String LOCALE_DELIMITER = "-";
 
-    // TODO move this to android.speech.tts.TextToSpeech.Engine
-    private static final String FALLBACK_TTS_DEFAULT_SYNTH = "com.svox.pico";
+    private static final String FALLBACK_TTS_DEFAULT_SYNTH =
+            TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_SYNTH;
 
     private Preference         mPlayExample = null;
     private Preference         mInstallData = null;
@@ -280,6 +280,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
                 Log.v(TAG, "Voice data check passed");
                 if (mTts == null) {
                     mTts = new TextToSpeech(this, this);
+                    mTts.setLanguage(Locale.getDefault());
                 }
             } else {
                 Log.v(TAG, "Voice data check failed");
@@ -319,6 +320,9 @@ public class TextToSpeechSettings extends PreferenceActivity implements
             Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, mDefaultLocVariant);
             Log.v(TAG, "TTS default lang/country/variant set to "
                     + mDefaultLanguage + "/" + mDefaultCountry + "/" + mDefaultLocVariant);
+            if (mTts != null) {
+                mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry));
+            }
         }
 
         return true;
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index e78e041..737627a 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -24,6 +24,7 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -60,12 +61,13 @@ public class PowerUsageDetail extends Activity implements Button.OnClickListener
         R.string.battery_desc_display,
         R.string.battery_desc_apps
     };
-    
+
     public static final int ACTION_DISPLAY_SETTINGS = 1;
     public static final int ACTION_WIFI_SETTINGS = 2;
     public static final int ACTION_BLUETOOTH_SETTINGS = 3;
     public static final int ACTION_WIRELESS_SETTINGS = 4;
-    public static final int ACTION_APP_DETAILS = 6;
+    public static final int ACTION_APP_DETAILS = 5;
+    public static final int ACTION_SECURITY_SETTINGS = 6;
 
     public static final int USAGE_SINCE_UNPLUGGED = 1;
     public static final int USAGE_SINCE_RESET = 2;
@@ -80,6 +82,7 @@ public class PowerUsageDetail extends Activity implements Button.OnClickListener
     public static final String EXTRA_DETAIL_VALUES = "values"; // Array of doubles
     public static final String EXTRA_DRAIN_TYPE = "drainType"; // DrainType
     public static final String EXTRA_ICON_PACKAGE = "iconPackage"; // String
+    public static final String EXTRA_NO_COVERAGE = "noCoverage";
     public static final String EXTRA_ICON_ID = "iconId"; // Int
 
     private static final boolean DEBUG = true;
@@ -90,16 +93,16 @@ public class PowerUsageDetail extends Activity implements Button.OnClickListener
     private double[] mValues;
     private TextView mTitleView;
     private ViewGroup mDetailsParent;
+    private ViewGroup mControlsParent;
     private long mStartTime;
     private DrainType mDrainType;
-    private int mAction1;
-    private int mAction2;
     private PercentageBar mGauge;
     private Drawable mAppIcon;
+    private double mNoCoverage; // Percentage of time that there was no coverage
+
+    private boolean mUsesGps;
 
     private static final String TAG = "PowerUsageDetail";
-    private Button mButton1;
-    private Button mButton2;
     private String[] mPackages;
 
     @Override
@@ -128,6 +131,7 @@ public class PowerUsageDetail extends Activity implements Button.OnClickListener
         mUsageSince = intent.getIntExtra(EXTRA_USAGE_SINCE, USAGE_SINCE_UNPLUGGED);
         mUid = intent.getIntExtra(EXTRA_UID, 0);
         mDrainType = (DrainType) intent.getSerializableExtra(EXTRA_DRAIN_TYPE);
+        mNoCoverage = intent.getDoubleExtra(EXTRA_NO_COVERAGE, 0);
         String iconPackage = intent.getStringExtra(EXTRA_ICON_PACKAGE);
         int iconId = intent.getIntExtra(EXTRA_ICON_ID, 0);
         if (!TextUtils.isEmpty(iconPackage)) {
@@ -167,40 +171,17 @@ public class PowerUsageDetail extends Activity implements Button.OnClickListener
 
         ImageView iconImage = (ImageView) findViewById(R.id.icon);
         iconImage.setImageDrawable(mAppIcon);
-        
+
         mDetailsParent = (ViewGroup) findViewById(R.id.details);
-        LayoutInflater inflater = getLayoutInflater();
-        if (mTypes != null && mValues != null) {
-            for (int i = 0; i < mTypes.length; i++) {
-                // Only add an item if the time is greater than zero
-                if (mValues[i] <= 0) continue;
-                final String label = getString(mTypes[i]);
-                String value = null;
-                switch (mTypes[i]) {
-                    case R.string.usage_type_data_recv:
-                    case R.string.usage_type_data_send:
-                        value = Utils.formatBytes(this, mValues[i]);
-                        break;
-                    default:
-                        value = Utils.formatElapsedTime(this, mValues[i]);
-                }
-                ViewGroup item = (ViewGroup) inflater.inflate(R.layout.power_usage_detail_item_text,
-                        null);
-                mDetailsParent.addView(item);
-                TextView labelView = (TextView) item.findViewById(R.id.label);
-                TextView valueView = (TextView) item.findViewById(R.id.value);
-                labelView.setText(label);
-                valueView.setText(value);
-            }
-        }
+        mControlsParent = (ViewGroup) findViewById(R.id.controls);
 
+        fillDetailsSection();
         fillPackagesSection(mUid);
         fillControlsSection(mUid);
     }
 
     public void onClick(View v) {
-        int action = v == mButton1 ? mAction1 : mAction2;
-        doAction(action);
+        doAction((Integer) v.getTag());
     }
 
     private void doAction(int action) {
@@ -209,9 +190,12 @@ public class PowerUsageDetail extends Activity implements Button.OnClickListener
                 startActivity(new Intent(Settings.ACTION_DISPLAY_SETTINGS));
                 break;
             case ACTION_WIFI_SETTINGS:
-                startActivity(new Intent(Settings.ACTION_WIRELESS_SETTINGS));
+                startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
                 break;
             case ACTION_BLUETOOTH_SETTINGS:
+                startActivity(new Intent(Settings.ACTION_BLUETOOTH_SETTINGS));
+                break;
+            case ACTION_WIRELESS_SETTINGS:
                 startActivity(new Intent(Settings.ACTION_WIRELESS_SETTINGS));
                 break;
             case ACTION_APP_DETAILS:
@@ -220,14 +204,46 @@ public class PowerUsageDetail extends Activity implements Button.OnClickListener
                 intent.putExtra("com.android.settings.ApplicationPkgName", mPackages[0]);
                 startActivity(intent);
                 break;
+            case ACTION_SECURITY_SETTINGS:
+                startActivity(new Intent(Settings.ACTION_SECURITY_SETTINGS));
+                break;
+        }
+    }
+
+    private void fillDetailsSection() {
+        LayoutInflater inflater = getLayoutInflater();
+        if (mTypes != null && mValues != null) {
+            for (int i = 0; i < mTypes.length; i++) {
+                // Only add an item if the time is greater than zero
+                if (mValues[i] <= 0) continue;
+                final String label = getString(mTypes[i]);
+                String value = null;
+                switch (mTypes[i]) {
+                    case R.string.usage_type_data_recv:
+                    case R.string.usage_type_data_send:
+                        value = Utils.formatBytes(this, mValues[i]);
+                        break;
+                    case R.string.usage_type_no_coverage:
+                        value = String.format("%d%%", (int) Math.floor(mValues[i]));
+                        break;
+                    case R.string.usage_type_gps:
+                        mUsesGps = true;
+                        // Fall through
+                    default:
+                        value = Utils.formatElapsedTime(this, mValues[i]);
+                }
+                ViewGroup item = (ViewGroup) inflater.inflate(R.layout.power_usage_detail_item_text,
+                        null);
+                mDetailsParent.addView(item);
+                TextView labelView = (TextView) item.findViewById(R.id.label);
+                TextView valueView = (TextView) item.findViewById(R.id.value);
+                labelView.setText(label);
+                valueView.setText(value);
+            }
         }
     }
 
     private void fillControlsSection(int uid) {
-        String label1 = null;
-        String label2 = null;
-        mAction1 = 0;
-        mAction2 = 0;
         PackageManager pm = getPackageManager();
         String[] packages = pm.getPackagesForUid(uid);
         PackageInfo pi = null;
@@ -237,45 +253,68 @@ public class PowerUsageDetail extends Activity implements Button.OnClickListener
         ApplicationInfo ai = pi != null? pi.applicationInfo : null;
         boolean isSystem = ai != null? (ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0 : false;
 
-        if (uid < 1000 || !isSystem) { 
-            switch (mDrainType) {
-                case APP:
-                    //label1 = getString(R.string.battery_action_stop);
-                    if (packages != null) {
-                        label2 = getString(R.string.battery_action_app_details);
-                        mAction2 = ACTION_APP_DETAILS;
-                    }
-                    break;
-                case SCREEN:
-                    label2 = getString(R.string.battery_action_display);
-                    mAction2 = ACTION_DISPLAY_SETTINGS;
-                    break;
-                case WIFI:
-                    label2 = getString(R.string.battery_action_wifi);
-                    mAction2 = ACTION_WIRELESS_SETTINGS;
-                    break;
-                case BLUETOOTH:
-                    //label2 = getString(R.string.battery_action_bluetooth);
-                    //mAction2 = ACTION_BLUETOOTH_SETTINGS;
-                    break;
-            }
-        }
-        mButton1 = (Button) findViewById(R.id.action_button1);
-        mButton2 = (Button) findViewById(R.id.action_button2);
-        mButton1.setOnClickListener(this);
-        mButton2.setOnClickListener(this);
-        if (label1 == null) {
-            mButton1.setVisibility(View.GONE);
-        } else {
-            mButton1.setText(label1);
+        boolean removeHeader = true;
+        switch (mDrainType) {
+            case APP:
+                // If it is a Java application and it's not a system application
+                if (packages != null && !isSystem) {
+                    addControl(R.string.battery_action_app_details,
+                            R.string.battery_sugg_apps_info, ACTION_APP_DETAILS);
+                    removeHeader = false;
+                    // If the application has a settings screen, jump to  that
+                    // TODO:
+                }
+                if (mUsesGps) {
+                    addControl(R.string.security_settings_title,
+                            R.string.battery_sugg_apps_gps, ACTION_SECURITY_SETTINGS);
+                    removeHeader = false;
+                }
+                break;
+            case SCREEN:
+                addControl(R.string.sound_and_display_settings,
+                        R.string.battery_sugg_display,
+                        ACTION_DISPLAY_SETTINGS);
+                removeHeader = false;
+                break;
+            case WIFI:
+                addControl(R.string.wifi_settings,
+                        R.string.battery_sugg_wifi,
+                        ACTION_WIFI_SETTINGS);
+                removeHeader = false;
+                break;
+            case BLUETOOTH:
+                addControl(R.string.bluetooth_settings,
+                        R.string.battery_sugg_bluetooth_basic,
+                        ACTION_BLUETOOTH_SETTINGS);
+                removeHeader = false;
+                break;
+            case CELL:
+                if (mNoCoverage > 10) {
+                    addControl(R.string.radio_controls_title,
+                            R.string.battery_sugg_radio,
+                            ACTION_WIRELESS_SETTINGS);
+                    removeHeader = false;
+                }
+                break;
         }
-        if (label2 == null) {
-            findViewById(R.id.controls_section).setVisibility(View.GONE);
-        } else {
-            mButton2.setText(label2);
+        if (removeHeader) {
+            mControlsParent.setVisibility(View.GONE);
         }
     }
 
+    private void addControl(int title, int summary, int action) {
+        final Resources res = getResources();
+        LayoutInflater inflater = getLayoutInflater();
+        ViewGroup item = (ViewGroup) inflater.inflate(R.layout.power_usage_action_item,null);
+        mControlsParent.addView(item);
+        Button actionButton = (Button) item.findViewById(R.id.action_button);
+        TextView summaryView = (TextView) item.findViewById(R.id.summary);
+        actionButton.setText(res.getString(title));
+        summaryView.setText(res.getString(summary));
+        actionButton.setOnClickListener(this);
+        actionButton.setTag(new Integer(action));
+    }
+
     private void removePackagesSection() {
         View view;
         if ((view = findViewById(R.id.packages_section_title)) != null) {
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 8df0919..3dc9914 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -80,9 +80,6 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
 
     private double mMaxPower = 1;
     private double mTotalPower;
-
-    private boolean mScaleByMax = true;
-
     private PowerProfile mPowerProfile;
 
     private HashMap<String,UidToDetail> mUidCache = new HashMap<String,UidToDetail>();
@@ -137,15 +134,19 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
                 Math.ceil(sipper.getSortValue() * 100 / mMaxPower));
         intent.putExtra(PowerUsageDetail.EXTRA_ICON_PACKAGE, sipper.defaultPackageName);
         intent.putExtra(PowerUsageDetail.EXTRA_ICON_ID, sipper.iconId);
+        intent.putExtra(PowerUsageDetail.EXTRA_NO_COVERAGE, sipper.noCoveragePercent);
         if (sipper.uidObj != null) {
             intent.putExtra(PowerUsageDetail.EXTRA_UID, sipper.uidObj.getUid());
         }
         intent.putExtra(PowerUsageDetail.EXTRA_DRAIN_TYPE, sipper.drainType);
+
+        int[] types;
+        double[] values;
         switch (sipper.drainType) {
             case APP:
             {
                 Uid uid = sipper.uidObj;
-                int[] types = new int[] {
+                types = new int[] {
                     R.string.usage_type_cpu,
                     R.string.usage_type_cpu_foreground,
                     R.string.usage_type_gps,
@@ -154,7 +155,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
                     R.string.usage_type_audio,
                     R.string.usage_type_video,
                 };
-                double[] values = new double[] {
+                values = new double[] {
                     sipper.cpuTime,
                     sipper.cpuFgTime,
                     sipper.gpsTime,
@@ -163,23 +164,33 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
                     0,
                     0
                 };
-                intent.putExtra(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
-                intent.putExtra(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
 
             }
             break;
+            case CELL:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time,
+                    R.string.usage_type_no_coverage
+                };
+                values = new double[] {
+                    sipper.usageTime,
+                    sipper.noCoveragePercent
+                };
+            }
+            break;
             default:
             {
-                int[] types = new int[] {
+                types = new int[] {
                     R.string.usage_type_on_time
                 };
-                double[] values = new double[] {
+                values = new double[] {
                     sipper.usageTime
                 };
-                intent.putExtra(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
-                intent.putExtra(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
             }
         }
+        intent.putExtra(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
+        intent.putExtra(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
         startActivity(intent);
 
         return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -243,19 +254,19 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
         mAppListGroup.setOrderingAsAdded(false);
 
         Collections.sort(mUsageList);
-        for (BatterySipper g : mUsageList) {
-            if (g.getSortValue() < MIN_POWER_THRESHOLD) continue;
-            double percent =  ((g.getSortValue() / mTotalPower) * 100);
-            if (percent < 1) continue;
-            PowerGaugePreference pref = new PowerGaugePreference(this, g.getIcon(), g);
-            double scaleByMax = (g.getSortValue() * 100) / mMaxPower;
-            g.percent = percent;
-            pref.setTitle(g.name);
-            pref.setPercent(percent);
-            pref.setOrder(Integer.MAX_VALUE - (int) g.getSortValue()); // Invert the order
-            pref.setGaugeValue(mScaleByMax ? scaleByMax : percent);
-            if (g.uidObj != null) {
-                pref.setKey(Integer.toString(g.uidObj.getUid()));
+        for (BatterySipper sipper : mUsageList) {
+            if (sipper.getSortValue() < MIN_POWER_THRESHOLD) continue;
+            final double percentOfTotal =  ((sipper.getSortValue() / mTotalPower) * 100);
+            if (percentOfTotal < 1) continue;
+            PowerGaugePreference pref = new PowerGaugePreference(this, sipper.getIcon(), sipper);
+            double percentOfMax = (sipper.getSortValue() * 100) / mMaxPower;
+            sipper.percent = percentOfTotal;
+            pref.setTitle(sipper.name);
+            pref.setPercent(percentOfTotal);
+            pref.setOrder(Integer.MAX_VALUE - (int) sipper.getSortValue()); // Invert the order
+            pref.setGaugeValue(percentOfMax);
+            if (sipper.uidObj != null) {
+                pref.setKey(Integer.toString(sipper.uidObj.getUid()));
             }
             mAppListGroup.addPreference(pref);
             if (mAppListGroup.getPreferenceCount() > MAX_ITEMS_TO_LIST) break;
@@ -275,7 +286,9 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
 
     private void updateStatsPeriod(long duration) {
         String durationString = Utils.formatElapsedTime(this, duration / 1000);
-        String label = getString(R.string.battery_stats_duration, durationString);
+        String label = getString(mStats.isOnBattery()
+                ? R.string.battery_stats_duration
+                : R.string.battery_stats_last_duration, durationString);
         setTitle(label);
     }
 
@@ -415,8 +428,13 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
                     * mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ON, i);
             signalTimeMs += strengthTimeMs;
         }
-        addEntry(getString(R.string.power_cell), DrainType.CELL, signalTimeMs,
+        BatterySipper bs =
+                addEntry(getString(R.string.power_cell), DrainType.CELL, signalTimeMs,
                 android.R.drawable.ic_menu_sort_by_size, power);
+        if (signalTimeMs != 0) {
+            bs.noCoveragePercent = mStats.getPhoneSignalStrengthTime(0, uSecNow, mStatsType)
+                    / 1000 * 100.0 / signalTimeMs;
+        }
     }
 
     private void addWiFiUsage(long uSecNow) {
@@ -441,6 +459,10 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
         long btOnTimeMs = mStats.getBluetoothOnTime(uSecNow, mStatsType) / 1000;
         double btPower = btOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_ON)
                 / 1000;
+        int btPingCount = mStats.getBluetoothPingCount();
+        btPower += (btPingCount
+                * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_AT_CMD)) / 1000;
+
         addEntry(getString(R.string.power_bluetooth), DrainType.IDLE, btOnTimeMs,
                 com.android.internal.R.drawable.ic_volume_bluetooth_in_call, btPower);
     }
@@ -456,7 +478,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
                 mStats.getMobileTcpBytesSent(mStatsType);
         final long wifiData = mStats.getTotalTcpBytesReceived(mStatsType) +
                 mStats.getTotalTcpBytesSent(mStatsType) - mobileData;
-        final long radioDataUptimeMs = mStats.getRadioDataUptimeMs();
+        final long radioDataUptimeMs = mStats.getRadioDataUptime() / 1000;
         final long mobileBps = radioDataUptimeMs != 0
                 ? mobileData * 8 * 1000 / radioDataUptimeMs
                 : MOBILE_BPS;
@@ -488,13 +510,15 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
         addRadioUsage(uSecNow);
     }
 
-    private void addEntry(String label, DrainType drainType, long time, int iconId, double power) {
+    private BatterySipper addEntry(String label, DrainType drainType, long time, int iconId,
+            double power) {
         if (power > mMaxPower) mMaxPower = power;
         mTotalPower += power;
         BatterySipper bs = new BatterySipper(label, drainType, iconId, null, new double[] {power});
         bs.usageTime = time;
         bs.iconId = iconId;
         mUsageList.add(bs);
+        return bs;
     }
 
     private void load() {
@@ -523,6 +547,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
         long gpsTime;
         long cpuFgTime;
         double percent;
+        double noCoveragePercent;
         String defaultPackageName;
 
         BatterySipper(String label, DrainType drainType, int iconId, Uid uid, double[] values) {
@@ -533,7 +558,6 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
                 icon = getResources().getDrawable(iconId);
             }
             if (values != null) value = values[0];
-            //if (uid > 0 && (mLabel == null || mIcon == null) // TODO:
             if ((label == null || iconId == 0) && uid != null) {
                 getQuickNameIconForUid(uid);
             }
@@ -631,9 +655,9 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
                 // Look for an official name for this UID.
                 for (String pkgName : packages) {
                     try {
-                        PackageInfo pi = pm.getPackageInfo(pkgName, 0);
+                        final PackageInfo pi = pm.getPackageInfo(pkgName, 0);
                         if (pi.sharedUserLabel != 0) {
-                            CharSequence nm = pm.getText(pkgName,
+                            final CharSequence nm = pm.getText(pkgName,
                                     pi.sharedUserLabel, pi.applicationInfo);
                             if (nm != null) {
                                 name = nm.toString();
diff --git a/src/com/android/settings/vpn/AuthenticationActor.java b/src/com/android/settings/vpn/AuthenticationActor.java
index 286064f..0228934 100644
--- a/src/com/android/settings/vpn/AuthenticationActor.java
+++ b/src/com/android/settings/vpn/AuthenticationActor.java
@@ -26,6 +26,7 @@ import android.net.vpn.IVpnService;
 import android.net.vpn.VpnManager;
 import android.net.vpn.VpnProfile;
 import android.net.vpn.VpnState;
+import android.os.ConditionVariable;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.text.TextUtils;
@@ -42,7 +43,6 @@ import java.io.IOException;
  */
 public class AuthenticationActor implements VpnProfileActor {
     private static final String TAG = AuthenticationActor.class.getName();
-    private static final int ONE_SECOND = 1000; // ms
 
     private Context mContext;
     private VpnProfile mProfile;
@@ -99,14 +99,18 @@ public class AuthenticationActor implements VpnProfileActor {
 
     //@Override
     public View createConnectView() {
-        return View.inflate(mContext, R.layout.vpn_connect_dialog_view, null);
-    }
+        View v = View.inflate(mContext, R.layout.vpn_connect_dialog_view, null);
+        TextView usernameView = (TextView) v.findViewById(R.id.username_value);
+        TextView passwordView = (TextView) v.findViewById(R.id.password_value);
+        CheckBox saveUsername = (CheckBox) v.findViewById(R.id.save_username);
 
-    //@Override
-    public void updateConnectView(Dialog d) {
         String username = mProfile.getSavedUsername();
-        if (username == null) username = "";
-        updateConnectView(d, username, "", !TextUtils.isEmpty(username));
+        if (!TextUtils.isEmpty(username)) {
+            usernameView.setText(username);
+            saveUsername.setChecked(true);
+            passwordView.requestFocus();
+        }
+        return v;
     }
 
     protected Context getContext() {
@@ -118,22 +122,20 @@ public class AuthenticationActor implements VpnProfileActor {
         ServiceConnection c = new ServiceConnection() {
             public void onServiceConnected(ComponentName className,
                     IBinder service) {
-                boolean success = false;
                 try {
-                    success = IVpnService.Stub.asInterface(service)
+                    boolean success = IVpnService.Stub.asInterface(service)
                             .connect(mProfile, username, password);
-                } catch (Throwable e) {
-                    Log.e(TAG, "connect()", e);
-                    checkStatus();
-                } finally {
-                    mContext.unbindService(this);
-
                     if (!success) {
                         Log.d(TAG, "~~~~~~ connect() failed!");
-                        broadcastConnectivity(VpnState.IDLE);
                     } else {
                         Log.d(TAG, "~~~~~~ connect() succeeded!");
                     }
+                } catch (Throwable e) {
+                    Log.e(TAG, "connect()", e);
+                    broadcastConnectivity(VpnState.IDLE,
+                            VpnManager.VPN_ERROR_CONNECTION_FAILED);
+                } finally {
+                    mContext.unbindService(this);
                 }
             }
 
@@ -141,7 +143,10 @@ public class AuthenticationActor implements VpnProfileActor {
                 checkStatus();
             }
         };
-        if (!bindService(c)) broadcastConnectivity(VpnState.IDLE);
+        if (!bindService(c)) {
+            broadcastConnectivity(VpnState.IDLE,
+                    VpnManager.VPN_ERROR_CONNECTION_FAILED);
+        }
     }
 
     //@Override
@@ -156,7 +161,6 @@ public class AuthenticationActor implements VpnProfileActor {
                     checkStatus();
                 } finally {
                     mContext.unbindService(this);
-                    broadcastConnectivity(VpnState.IDLE);
                 }
             }
 
@@ -164,58 +168,51 @@ public class AuthenticationActor implements VpnProfileActor {
                 checkStatus();
             }
         };
-        bindService(c);
+        if (!bindService(c)) {
+            checkStatus();
+        }
     }
 
     //@Override
     public void checkStatus() {
+        final ConditionVariable cv = new ConditionVariable();
+        cv.close();
         ServiceConnection c = new ServiceConnection() {
             public synchronized void onServiceConnected(ComponentName className,
                     IBinder service) {
+                cv.open();
                 try {
                     IVpnService.Stub.asInterface(service).checkStatus(mProfile);
-                } catch (Throwable e) {
+                } catch (RemoteException e) {
                     Log.e(TAG, "checkStatus()", e);
+                    broadcastConnectivity(VpnState.IDLE);
                 } finally {
-                    notify();
+                    mContext.unbindService(this);
                 }
             }
 
             public void onServiceDisconnected(ComponentName className) {
-                // do nothing
+                cv.open();
+                broadcastConnectivity(VpnState.IDLE);
+                mContext.unbindService(this);
             }
         };
         if (bindService(c)) {
             // wait for a second, let status propagate
-            wait(c, ONE_SECOND);
+            if (!cv.block(1000)) broadcastConnectivity(VpnState.IDLE);
         }
-        mContext.unbindService(c);
     }
 
     private boolean bindService(ServiceConnection c) {
         return mVpnManager.bindVpnService(c);
     }
 
-    private void updateConnectView(Dialog d, String username,
-            String password, boolean toSaveUsername) {
-        TextView usernameView = (TextView) d.findViewById(R.id.username_value);
-        TextView passwordView = (TextView) d.findViewById(R.id.password_value);
-        CheckBox saveUsername = (CheckBox) d.findViewById(R.id.save_username);
-        usernameView.setText(username);
-        passwordView.setText(password);
-        saveUsername.setChecked(toSaveUsername);
-    }
-
     private void broadcastConnectivity(VpnState s) {
         mVpnManager.broadcastConnectivity(mProfile.getName(), s);
     }
 
-    private void wait(Object o, int ms) {
-        synchronized (o) {
-            try {
-                o.wait(ms);
-            } catch (Exception e) {}
-        }
+    private void broadcastConnectivity(VpnState s, int errorCode) {
+        mVpnManager.broadcastConnectivity(mProfile.getName(), s, errorCode);
     }
 
     private void setSavedUsername(String name) throws IOException {
diff --git a/src/com/android/settings/vpn/VpnEditor.java b/src/com/android/settings/vpn/VpnEditor.java
index 1d419ea..b4dc2b6 100644
--- a/src/com/android/settings/vpn/VpnEditor.java
+++ b/src/com/android/settings/vpn/VpnEditor.java
@@ -31,6 +31,7 @@ import android.os.Parcelable;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
 import android.text.TextUtils;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -85,10 +86,9 @@ public class VpnEditor extends PreferenceActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case MENU_SAVE:
-                if (validateAndSetResult()) {
-                    finish();
-                }
+                if (validateAndSetResult()) finish();
                 return true;
+
             case MENU_CANCEL:
                 showCancellationConfirmDialog();
                 return true;
@@ -96,6 +96,16 @@ public class VpnEditor extends PreferenceActivity {
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_BACK:
+                if (validateAndSetResult()) finish();
+                return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
     private void initViewFor(VpnProfile profile) {
         setTitle(profile);
         mProfileEditor.loadPreferencesTo(getPreferenceScreen());
diff --git a/src/com/android/settings/vpn/VpnProfileActor.java b/src/com/android/settings/vpn/VpnProfileActor.java
index 1e71e86..da601f8 100644
--- a/src/com/android/settings/vpn/VpnProfileActor.java
+++ b/src/com/android/settings/vpn/VpnProfileActor.java
@@ -38,12 +38,6 @@ public interface VpnProfileActor {
     View createConnectView();
 
     /**
-     * Updates the view in the connect dialog.
-     * @param dialog the recycled connect dialog.
-     */
-    void updateConnectView(Dialog dialog);
-
-    /**
      * Validates the inputs in the dialog.
      * @param dialog the connect dialog
      * @return an error message if the inputs are not valid
diff --git a/src/com/android/settings/vpn/VpnProfileEditor.java b/src/com/android/settings/vpn/VpnProfileEditor.java
index a1cdc76..bf2e57d 100644
--- a/src/com/android/settings/vpn/VpnProfileEditor.java
+++ b/src/com/android/settings/vpn/VpnProfileEditor.java
@@ -25,6 +25,7 @@ import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
+import android.text.InputType;
 import android.text.TextUtils;
 import android.text.method.PasswordTransformationMethod;
 
@@ -32,6 +33,9 @@ import android.text.method.PasswordTransformationMethod;
  * The common class for editing {@link VpnProfile}.
  */
 class VpnProfileEditor {
+    static final String SECRET_SET_INDICATOR =
+            new String(new byte[] {(byte) 1, (byte) 0});
+
     private static final String KEY_VPN_NAME = "vpn_name";
 
     private EditTextPreference mName;
@@ -95,7 +99,7 @@ class VpnProfileEditor {
      * Creates a preference for users to input domain suffices.
      */
     protected EditTextPreference createDomainSufficesPreference(Context c) {
-        mDomainSuffices = createEditTextPreference(c,
+        EditTextPreference pref = mDomainSuffices = createEditTextPreference(c,
                 R.string.vpn_dns_search_list_title,
                 R.string.vpn_dns_search_list,
                 mProfile.getDomainSuffices(),
@@ -108,11 +112,12 @@ class VpnProfileEditor {
                         return true;
                     }
                 });
-        return mDomainSuffices;
+        pref.getEditText().setInputType(InputType.TYPE_TEXT_VARIATION_URI);
+        return pref;
     }
 
     private Preference createServerNamePreference(Context c) {
-        mServerName = createEditTextPreference(c,
+        EditTextPreference pref = mServerName = createEditTextPreference(c,
                 R.string.vpn_vpn_server_title,
                 R.string.vpn_vpn_server,
                 mProfile.getServerName(),
@@ -125,7 +130,8 @@ class VpnProfileEditor {
                         return true;
                     }
                 });
-        return mServerName;
+        pref.getEditText().setInputType(InputType.TYPE_TEXT_VARIATION_URI);
+        return pref;
     }
 
     protected EditTextPreference createEditTextPreference(Context c, int titleId,
@@ -147,9 +153,10 @@ class VpnProfileEditor {
         EditTextPreference pref = new EditTextPreference(c);
         pref.setTitle(titleId);
         pref.setDialogTitle(titleId);
+        pref.getEditText().setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
         pref.getEditText().setTransformationMethod(
                 new PasswordTransformationMethod());
-        pref.setText(value);
+        pref.setText(TextUtils.isEmpty(value) ? "" : SECRET_SET_INDICATOR);
         setSecretSummary(pref, fieldNameId, value);
         pref.setPersistent(true);
         pref.setOnPreferenceChangeListener(listener);
diff --git a/src/com/android/settings/vpn/VpnSettings.java b/src/com/android/settings/vpn/VpnSettings.java
index e429f9f..f0e71f7 100644
--- a/src/com/android/settings/vpn/VpnSettings.java
+++ b/src/com/android/settings/vpn/VpnSettings.java
@@ -18,13 +18,17 @@ package com.android.settings.vpn;
 
 import com.android.settings.R;
 import com.android.settings.SecuritySettings;
+import static com.android.settings.vpn.VpnProfileEditor.SECRET_SET_INDICATOR;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.ComponentName;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.ServiceConnection;
+import android.net.vpn.IVpnService;
 import android.net.vpn.L2tpIpsecPskProfile;
 import android.net.vpn.L2tpProfile;
 import android.net.vpn.VpnManager;
@@ -33,8 +37,10 @@ import android.net.vpn.VpnState;
 import android.net.vpn.VpnType;
 import android.os.Bundle;
 import android.os.ConditionVariable;
+import android.os.IBinder;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.os.RemoteException;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
@@ -86,8 +92,6 @@ public class VpnSettings extends PreferenceActivity implements
     private static final String PROFILES_ROOT = VpnManager.PROFILES_PATH + "/";
     private static final String PROFILE_OBJ_FILE = ".pobj";
 
-    private static final String STATE_ACTIVE_ACTOR = "active_actor";
-
     private static final int REQUEST_ADD_OR_EDIT_PROFILE = 1;
     private static final int REQUEST_SELECT_VPN_TYPE = 2;
 
@@ -99,7 +103,16 @@ public class VpnSettings extends PreferenceActivity implements
     private static final int CONNECT_BUTTON = DialogInterface.BUTTON1;
     private static final int OK_BUTTON = DialogInterface.BUTTON1;
 
-    private static final int DIALOG_CONNECT = 0;
+    private static final int DIALOG_CONNECT = 1;
+    private static final int DIALOG_RECONNECT = 2;
+    private static final int DIALOG_AUTH_ERROR = 3;
+    private static final int DIALOG_UNKNOWN_SERVER = 4;
+
+    private static final int NO_ERROR = 0;
+
+    private static final String NAMESPACE_VPN = "vpn";
+    private static final String KEY_PREFIX_IPSEC_PSK = "ipsk000";
+    private static final String KEY_PREFIX_L2TP_SECRET = "lscrt000";
 
     private PreferenceScreen mAddVpn;
     private PreferenceCategory mVpnListContainer;
@@ -108,14 +121,11 @@ public class VpnSettings extends PreferenceActivity implements
     private Map<String, VpnPreference> mVpnPreferenceMap;
     private List<VpnProfile> mVpnProfileList;
 
-    private int mIndexOfEditedProfile = -1;
-
     // profile engaged in a connection
     private VpnProfile mActiveProfile;
 
     // actor engaged in connecting
     private VpnProfileActor mConnectingActor;
-    private boolean mStateSaved = false;
 
     // states saved for unlocking keystore
     private Runnable mUnlockAction;
@@ -125,7 +135,9 @@ public class VpnSettings extends PreferenceActivity implements
     private ConnectivityReceiver mConnectivityReceiver =
             new ConnectivityReceiver();
 
-    private boolean mConnectingError;
+    private int mConnectingErrorCode = NO_ERROR;
+
+    private Dialog mShowingDialog;
 
     private StatusChecker mStatusChecker = new StatusChecker();
 
@@ -153,29 +165,13 @@ public class VpnSettings extends PreferenceActivity implements
         // listen to vpn connectivity event
         mVpnManager.registerConnectivityReceiver(mConnectivityReceiver);
 
-        String profileName = (savedInstanceState == null)
-                ? null
-                : savedInstanceState.getString(STATE_ACTIVE_ACTOR);
-        mStateSaved = !TextUtils.isEmpty(profileName);
         retrieveVpnListFromStorage();
-        if (mStateSaved) {
-            mConnectingActor =
-                    getActor(mVpnPreferenceMap.get(profileName).mProfile);
-        } else {
-            checkVpnConnectionStatusInBackground();
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mStatusChecker.onPause();
+        checkVpnConnectionStatusInBackground();
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        mStatusChecker.onResume();
 
         if ((mUnlockAction != null) && isKeystoreUnlocked()) {
             Runnable action = mUnlockAction;
@@ -185,18 +181,13 @@ public class VpnSettings extends PreferenceActivity implements
     }
 
     @Override
-    protected synchronized void onSaveInstanceState(Bundle outState) {
-        if (mConnectingActor == null) return;
-
-        outState.putString(STATE_ACTIVE_ACTOR,
-                mConnectingActor.getProfile().getName());
-    }
-
-    @Override
     protected void onDestroy() {
         super.onDestroy();
         unregisterForContextMenu(getListView());
         mVpnManager.unregisterConnectivityReceiver(mConnectivityReceiver);
+        if ((mShowingDialog != null) && mShowingDialog.isShowing()) {
+            mShowingDialog.dismiss();
+        }
     }
 
     @Override
@@ -205,39 +196,74 @@ public class VpnSettings extends PreferenceActivity implements
             case DIALOG_CONNECT:
                 return createConnectDialog();
 
+            case DIALOG_RECONNECT:
+                return createReconnectDialogBuilder().create();
+
+            case DIALOG_AUTH_ERROR:
+                return createAuthErrorDialog();
+
+            case DIALOG_UNKNOWN_SERVER:
+                return createUnknownServerDialog();
+
             default:
-                return null;
+                return super.onCreateDialog(id);
         }
     }
 
     private Dialog createConnectDialog() {
-        if (mConnectingActor == null) {
-            Log.e(TAG, "no connecting actor to create the dialog");
-            return null;
-        }
-        String name = (mConnectingActor == null)
-                ? getString(R.string.vpn_default_profile_name)
-                : mConnectingActor.getProfile().getName();
-        Dialog d = new AlertDialog.Builder(this)
+        return new AlertDialog.Builder(this)
                 .setView(mConnectingActor.createConnectView())
                 .setTitle(String.format(getString(R.string.vpn_connect_to),
-                        name))
+                        mConnectingActor.getProfile().getName()))
                 .setPositiveButton(getString(R.string.vpn_connect_button),
                         this)
                 .setNegativeButton(getString(android.R.string.cancel),
                         this)
                 .create();
-        return d;
     }
 
-    @Override
-    protected void onPrepareDialog (int id, Dialog dialog) {
-        if (mStateSaved) {
-            mStateSaved = false;
-            super.onPrepareDialog(id, dialog);
-        } else if (mConnectingActor != null) {
-            mConnectingActor.updateConnectView(dialog);
-        }
+    private AlertDialog.Builder createReconnectDialogBuilder() {
+        return new AlertDialog.Builder(this)
+                .setTitle(android.R.string.dialog_alert_title)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setMessage(R.string.vpn_confirm_reconnect)
+                .setPositiveButton(R.string.vpn_yes_button,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int w) {
+                                connectOrDisconnect(mConnectingActor.getProfile());
+                            }
+                        })
+                .setNegativeButton(R.string.vpn_no_button,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int w) {
+                                onIdle();
+                            }
+                        })
+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                            public void onCancel(DialogInterface dialog) {
+                                onIdle();
+                            }
+                        });
+    }
+
+    private Dialog createAuthErrorDialog() {
+        return createReconnectDialogBuilder()
+                .setMessage(R.string.vpn_auth_error_dialog_msg)
+                .create();
+    }
+
+    private Dialog createUnknownServerDialog() {
+        return createReconnectDialogBuilder()
+                .setMessage(R.string.vpn_unknown_server_dialog_msg)
+                .setPositiveButton(R.string.vpn_yes_button,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int w) {
+                                VpnProfile p = mConnectingActor.getProfile();
+                                onIdle();
+                                startVpnEditor(p);
+                            }
+                        })
+                .create();
     }
 
     @Override
@@ -252,8 +278,8 @@ public class VpnSettings extends PreferenceActivity implements
             menu.setHeaderTitle(p.getName());
 
             boolean isIdle = (state == VpnState.IDLE);
-            boolean isNotConnect =
-                    (isIdle || (state == VpnState.DISCONNECTING));
+            boolean isNotConnect = (isIdle || (state == VpnState.DISCONNECTING)
+                    || (state == VpnState.CANCELLED));
             menu.add(0, CONTEXT_MENU_CONNECT_ID, 0, R.string.vpn_menu_connect)
                     .setEnabled(isIdle && (mActiveProfile == null));
             menu.add(0, CONTEXT_MENU_DISCONNECT_ID, 0,
@@ -279,7 +305,6 @@ public class VpnSettings extends PreferenceActivity implements
             return true;
 
         case CONTEXT_MENU_EDIT_ID:
-            mIndexOfEditedProfile = position;
             startVpnEditor(p);
             return true;
 
@@ -294,9 +319,6 @@ public class VpnSettings extends PreferenceActivity implements
     @Override
     protected void onActivityResult(final int requestCode, final int resultCode,
             final Intent data) {
-        final int index = mIndexOfEditedProfile;
-        mIndexOfEditedProfile = -1;
-
         if ((resultCode == RESULT_CANCELED) || (data == null)) {
             Log.d(TAG, "no result returned by editor");
             return;
@@ -312,6 +334,7 @@ public class VpnSettings extends PreferenceActivity implements
                 return;
             }
 
+            int index = getProfileIndexFromId(p.getId());
             if (checkDuplicateName(p, index)) {
                 final VpnProfile profile = p;
                 Util.showErrorMessage(this, String.format(
@@ -328,7 +351,6 @@ public class VpnSettings extends PreferenceActivity implements
             if (needKeystoreToSave(p)) {
                 Runnable action = new Runnable() {
                     public void run() {
-                        mIndexOfEditedProfile = index;
                         onActivityResult(requestCode, resultCode, data);
                     }
                 };
@@ -336,7 +358,7 @@ public class VpnSettings extends PreferenceActivity implements
             }
 
             try {
-                if ((index < 0) || (index >= mVpnProfileList.size())) {
+                if (index < 0) {
                     addProfile(p);
                     Util.showShortToastMessage(this, String.format(
                             getString(R.string.vpn_profile_added), p.getName()));
@@ -363,17 +385,18 @@ public class VpnSettings extends PreferenceActivity implements
     // Called when the buttons on the connect dialog are clicked.
     //@Override
     public synchronized void onClick(DialogInterface dialog, int which) {
-        dismissDialog(DIALOG_CONNECT);
         if (which == CONNECT_BUTTON) {
             Dialog d = (Dialog) dialog;
             String error = mConnectingActor.validateInputs(d);
             if (error == null) {
                 changeState(mConnectingActor.getProfile(), VpnState.CONNECTING);
                 mConnectingActor.connect(d);
+                removeDialog(DIALOG_CONNECT);
                 return;
             } else {
+                dismissDialog(DIALOG_CONNECT);
                 // show error dialog
-                new AlertDialog.Builder(this)
+                mShowingDialog = new AlertDialog.Builder(this)
                         .setTitle(android.R.string.dialog_alert_title)
                         .setIcon(android.R.drawable.ic_dialog_alert)
                         .setMessage(String.format(getString(
@@ -385,9 +408,24 @@ public class VpnSettings extends PreferenceActivity implements
                                         showDialog(DIALOG_CONNECT);
                                     }
                                 })
-                        .show();
+                        .create();
+                mShowingDialog.show();
+            }
+        } else {
+            removeDialog(DIALOG_CONNECT);
+        }
+    }
+
+    private int getProfileIndexFromId(String id) {
+        int index = 0;
+        for (VpnProfile p : mVpnProfileList) {
+            if (p.getId().equals(id)) {
+                return index;
+            } else {
+                index++;
             }
         }
+        return -1;
     }
 
     // Replaces the profile at index in mVpnProfileList with p.
@@ -428,13 +466,14 @@ public class VpnSettings extends PreferenceActivity implements
                         }
                     }
                 };
-        new AlertDialog.Builder(this)
+        mShowingDialog = new AlertDialog.Builder(this)
                 .setTitle(android.R.string.dialog_alert_title)
                 .setIcon(android.R.drawable.ic_dialog_alert)
                 .setMessage(R.string.vpn_confirm_profile_deletion)
                 .setPositiveButton(android.R.string.ok, onClickListener)
                 .setNegativeButton(R.string.vpn_no_button, onClickListener)
-                .show();
+                .create();
+        mShowingDialog.show();
     }
 
     // Randomly generates an ID for the profile.
@@ -458,17 +497,24 @@ public class VpnSettings extends PreferenceActivity implements
 
     private void addProfile(VpnProfile p) throws IOException {
         setProfileId(p);
+        processSecrets(p);
         saveProfileToStorage(p);
+
         mVpnProfileList.add(p);
         addPreferenceFor(p);
         disableProfilePreferencesIfOneActive();
     }
 
+    private VpnPreference addPreferenceFor(VpnProfile p) {
+        return addPreferenceFor(p, true);
+    }
+
     // Adds a preference in mVpnListContainer
-    private void addPreferenceFor(VpnProfile p) {
+    private VpnPreference addPreferenceFor(
+            VpnProfile p, boolean addToContainer) {
         VpnPreference pref = new VpnPreference(this, p);
         mVpnPreferenceMap.put(p.getName(), pref);
-        mVpnListContainer.addPreference(pref);
+        if (addToContainer) mVpnListContainer.addPreference(pref);
 
         pref.setOnPreferenceClickListener(
                 new Preference.OnPreferenceClickListener() {
@@ -477,6 +523,7 @@ public class VpnSettings extends PreferenceActivity implements
                         return true;
                     }
                 });
+        return pref;
     }
 
     // index: index to mVpnProfileList
@@ -581,8 +628,8 @@ public class VpnSettings extends PreferenceActivity implements
         }
 
         mConnectingActor = getActor(p);
+        mActiveProfile = p;
         if (mConnectingActor.isConnectDialogNeeded()) {
-            removeDialog(DIALOG_CONNECT);
             showDialog(DIALOG_CONNECT);
         } else {
             changeState(p, VpnState.CONNECTING);
@@ -603,8 +650,6 @@ public class VpnSettings extends PreferenceActivity implements
                 break;
 
             case CONNECTED:
-                mConnectingError = false;
-                // pass through
             case DISCONNECTING:
                 changeState(p, VpnState.DISCONNECTING);
                 getActor(p).disconnect();
@@ -623,16 +668,13 @@ public class VpnSettings extends PreferenceActivity implements
         switch (state) {
         case CONNECTED:
             mConnectingActor = null;
-            // pass through
-        case CONNECTING:
             mActiveProfile = p;
             disableProfilePreferencesIfOneActive();
             break;
 
+        case CONNECTING:
         case DISCONNECTING:
-            if (oldState == VpnState.CONNECTING) {
-                mConnectingError = true;
-            }
+            disableProfilePreferencesIfOneActive();
             break;
 
         case CANCELLED:
@@ -640,31 +682,34 @@ public class VpnSettings extends PreferenceActivity implements
             break;
 
         case IDLE:
-            assert(mActiveProfile != p);
-            mActiveProfile = null;
-            mConnectingActor = null;
-            enableProfilePreferences();
+            assert(mActiveProfile == p);
 
-            if (oldState == VpnState.CONNECTING) mConnectingError = true;
-            if (mConnectingError) showReconnectDialog(p);
+            switch (mConnectingErrorCode) {
+                case NO_ERROR:
+                    onIdle();
+                    break;
+
+                case VpnManager.VPN_ERROR_AUTH:
+                    showDialog(DIALOG_AUTH_ERROR);
+                    break;
+
+                case VpnManager.VPN_ERROR_UNKNOWN_SERVER:
+                    showDialog(DIALOG_UNKNOWN_SERVER);
+                    break;
+
+                default:
+                    showDialog(DIALOG_RECONNECT);
+                    break;
+            }
+            mConnectingErrorCode = NO_ERROR;
             break;
         }
     }
 
-    private void showReconnectDialog(final VpnProfile p) {
-        new AlertDialog.Builder(this)
-                .setTitle(android.R.string.dialog_alert_title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setMessage(R.string.vpn_confirm_reconnect)
-                .setPositiveButton(R.string.vpn_yes_button,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int w) {
-                                dialog.dismiss();
-                                connectOrDisconnect(p);
-                            }
-                        })
-                .setNegativeButton(R.string.vpn_no_button, null)
-                .show();
+    private void onIdle() {
+        mActiveProfile = null;
+        mConnectingActor = null;
+        enableProfilePreferences();
     }
 
     private void disableProfilePreferencesIfOneActive() {
@@ -672,6 +717,7 @@ public class VpnSettings extends PreferenceActivity implements
 
         for (VpnProfile p : mVpnProfileList) {
             switch (p.getState()) {
+                case CONNECTING:
                 case DISCONNECTING:
                 case IDLE:
                     mVpnPreferenceMap.get(p.getName()).setEnabled(false);
@@ -738,12 +784,18 @@ public class VpnSettings extends PreferenceActivity implements
                 return false;
             }
         });
-        for (VpnProfile p : mVpnProfileList) addPreferenceFor(p);
+        for (VpnProfile p : mVpnProfileList) {
+            Preference pref = addPreferenceFor(p, false);
+        }
         disableProfilePreferencesIfOneActive();
     }
 
     private void checkVpnConnectionStatusInBackground() {
-        mStatusChecker.check(mVpnProfileList);
+        new Thread(new Runnable() {
+            public void run() {
+                mStatusChecker.check(mVpnProfileList);
+            }
+        }).start();
     }
 
     // A sanity check. Returns true if the profile directory name and profile ID
@@ -791,32 +843,37 @@ public class VpnSettings extends PreferenceActivity implements
         return mVpnManager.createVpnProfile(Enum.valueOf(VpnType.class, type));
     }
 
-    private static final String NAMESPACE_VPN = "vpn";
-    private static final String KEY_PREFIX_IPSEC_PSK = "ipsk000";
-    private static final String KEY_PREFIX_L2TP_SECRET = "lscrt000";
+    private String keyNameForDaemon(String keyName) {
+        return NAMESPACE_VPN + "_" + keyName;
+    }
 
     private void processSecrets(VpnProfile p) {
         Keystore ks = Keystore.getInstance();
         switch (p.getType()) {
             case L2TP_IPSEC_PSK:
                 L2tpIpsecPskProfile pskProfile = (L2tpIpsecPskProfile) p;
-                String keyName = KEY_PREFIX_IPSEC_PSK + p.getId();
                 String presharedKey = pskProfile.getPresharedKey();
-                if (!presharedKey.equals(keyName)) {
-                    ks.put(NAMESPACE_VPN, keyName, presharedKey);
-                    pskProfile.setPresharedKey(NAMESPACE_VPN + "_" + keyName);
+                if (!presharedKey.equals(SECRET_SET_INDICATOR)) {
+                    String keyName = KEY_PREFIX_IPSEC_PSK + p.getId();
+                    int ret = ks.put(NAMESPACE_VPN, keyName, presharedKey);
+                    if (ret < 0) {
+                        Log.e(TAG, "keystore write failed: key=" + keyName);
+                    }
+                    pskProfile.setPresharedKey(keyNameForDaemon(keyName));
                 }
                 // pass through
 
             case L2TP:
                 L2tpProfile l2tpProfile = (L2tpProfile) p;
-                keyName = KEY_PREFIX_L2TP_SECRET + p.getId();
-                String secret = l2tpProfile.getSecretString();
+                String keyName = KEY_PREFIX_L2TP_SECRET + p.getId();
                 if (l2tpProfile.isSecretEnabled()) {
-                    if (!secret.equals(keyName)) {
-                        ks.put(NAMESPACE_VPN, keyName, secret);
-                        l2tpProfile.setSecretString(
-                                NAMESPACE_VPN + "_" + keyName);
+                    String secret = l2tpProfile.getSecretString();
+                    if (!secret.equals(SECRET_SET_INDICATOR)) {
+                        int ret = ks.put(NAMESPACE_VPN, keyName, secret);
+                        if (ret < 0) {
+                            Log.e(TAG, "keystore write failed: key=" + keyName);
+                        }
+                        l2tpProfile.setSecretString(keyNameForDaemon(keyName));
                     }
                 } else {
                     ks.remove(NAMESPACE_VPN, keyName);
@@ -849,14 +906,20 @@ public class VpnSettings extends PreferenceActivity implements
 
             VpnState s = (VpnState) intent.getSerializableExtra(
                     VpnManager.BROADCAST_CONNECTION_STATE);
+
             if (s == null) {
                 Log.e(TAG, "received null connectivity state");
                 return;
             }
+
+            mConnectingErrorCode = intent.getIntExtra(
+                    VpnManager.BROADCAST_ERROR_CODE, NO_ERROR);
+
             VpnPreference pref = mVpnPreferenceMap.get(profileName);
             if (pref != null) {
                 Log.d(TAG, "received connectivity: " + profileName
-                        + ": connected? " + s);
+                        + ": connected? " + s
+                        + "   err=" + mConnectingErrorCode);
                 changeState(pref.mProfile, s);
             } else {
                 Log.e(TAG, "received connectivity: " + profileName
@@ -868,48 +931,58 @@ public class VpnSettings extends PreferenceActivity implements
 
     // managing status check in a background thread
     private class StatusChecker {
-        private Set<VpnProfile> mQueue = new HashSet<VpnProfile>();
-        private boolean mPaused;
-        private ConditionVariable mThreadCv = new ConditionVariable();
-
-        void onPause() {
-            mPaused = true;
-            mThreadCv.block(); // until the checking thread is over
-        }
+        private List<VpnProfile> mList;
+
+        synchronized void check(final List<VpnProfile> list) {
+            final ConditionVariable cv = new ConditionVariable();
+            cv.close();
+            mVpnManager.startVpnService();
+            ServiceConnection c = new ServiceConnection() {
+                public synchronized void onServiceConnected(
+                        ComponentName className, IBinder binder) {
+                    cv.open();
+
+                    IVpnService service = IVpnService.Stub.asInterface(binder);
+                    for (VpnProfile p : list) {
+                        try {
+                            service.checkStatus(p);
+                        } catch (Throwable e) {
+                            Log.e(TAG, " --- checkStatus(): " + p.getName(), e);
+                            changeState(p, VpnState.IDLE);
+                        }
+                    }
+                    VpnSettings.this.unbindService(this);
+                    showPreferences();
+                }
 
-        synchronized void onResume() {
-            mPaused = false;
-            start();
-        }
+                public void onServiceDisconnected(ComponentName className) {
+                    cv.open();
 
-        synchronized void check(List<VpnProfile> list) {
-            boolean started = !mQueue.isEmpty();
-            for (VpnProfile p : list) {
-                if (!mQueue.contains(p)) mQueue.add(p);
+                    setDefaultState(list);
+                    VpnSettings.this.unbindService(this);
+                    showPreferences();
+                }
+            };
+            if (mVpnManager.bindVpnService(c)) {
+                if (!cv.block(1000)) {
+                    Log.d(TAG, "checkStatus() bindService failed");
+                    setDefaultState(list);
+                }
+            } else {
+                setDefaultState(list);
             }
-            if (!started) start();
         }
 
-        private synchronized VpnProfile next() {
-            if (mPaused || mQueue.isEmpty()) return null;
-            Iterator<VpnProfile> i = mQueue.iterator();
-            VpnProfile p = i.next();
-            i.remove();
-            return p;
+        private void showPreferences() {
+            for (VpnProfile p : mVpnProfileList) {
+                VpnPreference pref = mVpnPreferenceMap.get(p.getName());
+                mVpnListContainer.addPreference(pref);
+            }
         }
 
-        private void start() {
-            mThreadCv.close();
-            new Thread(new Runnable() {
-                public void run() {
-                    while (true) {
-                        VpnProfile p = next();
-                        if (p == null) break;
-                        getActor(p).checkStatus();
-                    }
-                    mThreadCv.open();
-                }
-            }).start();
+        private void setDefaultState(List<VpnProfile> list) {
+            for (VpnProfile p : list) changeState(p, VpnState.IDLE);
+            showPreferences();
         }
     }
 }
diff --git a/src/com/android/settings/wifi/WifiLayer.java b/src/com/android/settings/wifi/WifiLayer.java
index 751a5a3..5d896aa 100644
--- a/src/com/android/settings/wifi/WifiLayer.java
+++ b/src/com/android/settings/wifi/WifiLayer.java
@@ -423,6 +423,17 @@ public class WifiLayer {
         }
         
         /*
+         * It's necessary to update the network id of this state because the network id
+         * could have changed after the configuration is saved. For example, if there are
+         * more than 10 saved open-networks, some older open-networks will have been be forgotten.
+         */
+        state.setNetworkId(AccessPointState.NETWORK_ID_ANY);
+        config = findConfiguredNetwork(state);
+        if (config != null) {
+            state.setNetworkId(config.networkId);
+        }
+
+        /*
          * We could reload the configured networks, but instead just shortcut
          * and add this state to our list in memory
          */
@@ -501,7 +512,7 @@ public class WifiLayer {
         
         if (!mWifiManager.isWifiEnabled()) return;
         
-        if (!mWifiManager.startScan()) {
+        if (!mWifiManager.startScanActive()) {
             postAttemptScan();
         } else {
             mScanRetryCount = 0;
author	Jean-Baptiste Queru <jbq@google.com>	2009-07-29 14:57:07 -0700
committer	Jean-Baptiste Queru <jbq@google.com>	2009-07-29 14:57:07 -0700
commit	5f16c148dad5a1b8593473bef2f3b8d05d902017 (patch)
tree	058a3a3c9f7e0888206fa26190398933b5b5a2fd
parent	aedd7474367a4ae2a2c7e16ec59aecbd77cc165c (diff)
parent	e0b5f33c6828073d04b5123f3f79d4b2728d8762 (diff)
download	packages_apps_Settings-5f16c148dad5a1b8593473bef2f3b8d05d902017.zip packages_apps_Settings-5f16c148dad5a1b8593473bef2f3b8d05d902017.tar.gz packages_apps_Settings-5f16c148dad5a1b8593473bef2f3b8d05d902017.tar.bz2