diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index abe39af..fad5cb8 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statická"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Vypnuto"</item>
     <item msgid="3165868966179561687">"Výstraha"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1c899df..027b00c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Odpojit kartu SD"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Formátovat kartu SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Odpojit úložiště USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Odpojit kartu SD"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Smazat úložiště USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Smazat kartu SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Malá"</string>
     <string name="medium_font" msgid="2068475425515133701">"Střední"</string>
     <string name="large_font" msgid="599055175160971446">"Velká"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"Karta SD"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Úložiště USB"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Karta SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Stav baterie:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Napájecí konektor:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Měřítko baterie:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Vybitá"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Přepětí"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznámá chyba"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Viditelné"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Zařízení je viditelné v intervalu <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s."</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Spustit činnost <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Účet:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Nastavení serveru proxy"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Nastavení globálního proxy serveru protokolu HTTP a seznamu vyloučení"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Vymazat"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Nepoužívat proxy server pro"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnovit výchozí nastavení"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Hotovo"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Název hostitele"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Upozornění"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Zadaný název hostitele není platný."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Seznam vyloučení, který jste vytvořili, má nesprávný formát. Zadejte prosím seznam názvů domén k vyloučení a jednotlivé názvy oddělte čárkami."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Je třeba vyplnit pole port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pokud je pole hostitel prázdné, musí být prázdné i pole port."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Zadaný port není platný."</string>
@@ -189,16 +189,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Změna se projeví při příštím připojení kabelu USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Povolit velkokapacitní paměťové zařízení USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Celková paměť (bajty):"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Žádná karta SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Úložiště USB není připojeno"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Žádná karta SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Dostupná paměť (bajty):"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"Karta SD je využívána jako velkokapacitní paměťové zařízení."</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"Nyní můžete kartu SD bezpečně odebrat."</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"Karta SD byla odstraněna za provozu."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Úložiště USB využíváno jako velkokapacitní paměťové zařízení"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Karta SD je využívána jako velkokapacitní paměťové zařízení."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Úložiště USB lze nyní odebrat"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Nyní můžete kartu SD bezpečně odebrat."</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Úlož. USB odebráno za provozu."</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Karta SD byla odstraněna za provozu."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Obsazená paměť (bajty):"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Vyhledávání mediálních souborů na kartě SD..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"Karta SD byla připojena pouze pro čtení."</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Hledání médií v úložišti USB…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Vyhledávání mediálních souborů na kartě SD..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Úlož. připojeno jen pro čtení"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Karta SD byla připojena pouze pro čtení."</string>
+    <string name="skip_label" msgid="47510779345218297">"Dále"</string>
     <string name="next_label" msgid="4693520878012668114">"Další"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Jazyk"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Zvolit činnost"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Info o baterii"</string>
     <string name="display_label" msgid="7403874003169865762">"Zobrazení"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Info o telefonu"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"Karta SD"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Úložiště USB"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Karta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Nastavení proxy serveru"</string>
     <string name="cancel" msgid="6859253417269739139">"Zrušit"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nastavení"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavení"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Nastavení"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Režim V letadle"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Vypne všechna bezdrátová připojení"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Vybrat síťového operátora"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum a čas"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Umožňuje nastavit datum, čas, časové pásmo a formát"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatické datum a čas"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Použít čas ze sítě"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Použít čas ze sítě"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatické časové pásmo"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Použít časové pásmo ze sítě"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Použít časové pásmo ze sítě"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Použít 24hodinový formát"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Nastavení času"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Volba časového pásma"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Řadit podle časového pásma"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Uzamknout zařízení po vypršení časového limitu"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Změna prodlevy, po které se zařízení automaticky uzamkne"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Poloha a zabezpečení"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Nastavení polohy a zabezpečení"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Zrušit"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Správa zařízení"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Vyberte správce zařízení"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Přidat nebo odebrat správce zařízení"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Vyberte správce zařízení"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Přidat nebo odebrat správce zařízení"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Zapnout Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Nastavení Bluetooth"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon pro hlasitý poslech"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pro hudbu a média"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamatovat nastavení"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Použít technologii NFC ke čtení a výměně štítků"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Zapnout WiFi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Nastavení WiFi"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Připojit k síti"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstranit záznam sítě"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upravit síť"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Nastavení sítě"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Zadejte kód PIN z přístupového bodu"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"Identifikátor SSID sítě"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpečení"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identita"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymní identita"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Heslo"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Zobrazovat heslo"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Nastavení adresy IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nezměněno)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(neurčeno)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Uložené nastavení"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Vypnuto"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Mimo dosah"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Zabezpečení <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Zabezpečení <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Zabezpečení: <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (k dispozici WPS)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, zabezpečení <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Připojit"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstranit"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Nastavení adresy IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Uložit"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Zrušit"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Zadejte platnou adresu IP."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"Server DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"Server DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brána"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Maska sítě"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Přenosný hotspot Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Přenosný hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivní"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Chyba přenosného hotspotu Wi-Fi"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stav"</string>
     <string name="device_status" msgid="607405385799807324">"Stav"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Telefonní číslo, signál, atd."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Umožňuje odpojit kartu SD a zobrazit dostupnou paměť"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Sdílené a bezpečné úlož."</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Úložiště"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Nastavení úložiště"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Odpojit úložiště USB a zobrazit dostupné úložiště"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Umožňuje odpojit kartu SD a zobrazit dostupnou paměť"</string>
     <string name="status_number" msgid="5123197324870153205">"Moje telefonní číslo"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Verze PRL"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Nedostupný údaj"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Doba provozu"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Doba provozu"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Interní paměť telefonu"</string>
-    <string name="sd_memory" msgid="151871913888051515">"Karta SD"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Interní úložiště"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Úložiště USB"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Karta SD"</string>
     <string name="memory_available" msgid="418542433817289474">"Dostupná paměť"</string>
     <string name="memory_size" msgid="6629067715017232195">"Celková paměť"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Odpojit kartu SD"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Odpojit kartu SD za účelem bezpečného odebrání"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odpojit sdílené úložiště"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Odpojit kartu SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Odpojit interní úložiště USB"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"K bezpečnému odebrání karty SD je potřeba kartu nejprve odpojit"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Aktivovat režim PTP"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Zobrazovat na rozhraní USB jako zařízení fotoaparátu PTP namísto zařízení MTP"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Vložte kartu SD, kterou chcete připojit."</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Připojit kartu SD"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Připojit kartu SD"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Formátovat kartu SD"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Formátovat (vymazat) kartu SD"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Vložte úložiště USB"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Vložte kartu SD, kterou chcete připojit."</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Připojit sdílené úložiště"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Připojit kartu SD"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Připojit interní úložiště USB"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Připojit kartu SD"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Smazat úložiště USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Smazat kartu SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Smaže všechna data v interním úložišti USB telefonu, například hudbu a fotografie"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Smaže všechna data na kartě SD telefonu, například hudbu a fotografie"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Nedostupný údaj"</string>
     <string name="read_only" msgid="6702420168629076340">" (Pouze pro čtení)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Odpojit kartu SD"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Pokud odpojíte kartu SD, dojde k zastavení některých používaných aplikací. Tyto aplikace pravděpodobně nebudou k dispozici až do opětovného připojení karty SD."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Odpojení karty SD se nezdařilo"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Kartu SD nelze odpojit. Zkuste to znovu později."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"Karta SD bude odpojena. Stav bude zobrazen v oznamovací oblasti."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Odpojit úložiště USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Odpojit kartu SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Pokud úložiště USB odpojíte, některé používané aplikace přestanou fungovat. Tyto aplikace pravděpodobně nebudou k dispozici, dokud úložiště USB znovu nepřipojíte."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Pokud odpojíte kartu SD, dojde k zastavení některých používaných aplikací. Tyto aplikace pravděpodobně nebudou k dispozici až do opětovného připojení karty SD."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Odpojení úložiště USB se nezdařilo"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Odpojení karty SD se nezdařilo"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Úložiště USB nelze odpojit. Zkuste to znovu později."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Kartu SD nelze odpojit. Zkuste to znovu později."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Úložiště USB bude odpojeno."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Karta SD bude odpojena."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Odpojování"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Probíhá odpojování"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stav baterie"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Obnovení výchozích nastavení názvu AP bylo dokončeno."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Obnovení továrních dat"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Vymaže všechna data v telefonu"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Tento krok vymaže všechna data z vašeho telefonu včetně:"\n<li>"vašeho účtu Google,"</li>\n<li>"dat a nastavení systému a aplikací,"</li>\n<li>"stažených aplikací."</li>\n"Vymazány nebudou:"\n<li>"aktuální software systému a s ním dodané aplikace"</li>\n<li>"soubory na kartě SD, například hudba a fotky."</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Tato akce smaže všechna data z "<b>"interního úložiště"</b>" telefonu, včetně:"\n\n<li>"účtu Google,"</li>\n<li>"dat a nastavení systému a aplikací,"</li>\n<li>"stažených aplikací."</li>\n\n"Chcete-li smazat všechna data v tomto telefonu, je potřeba smazat"<b>"úložiště USB"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Tato akce smaže všechna data z "<b>"interního úložiště"</b>" telefonu, včetně:"\n\n<li>"účtu Google,"</li>\n<li>"dat a nastavení aplikací a systému,"</li>\n<li>"stažených aplikací."</li>\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba smazat"<b>"kartu SD"</b>\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Smazat úložiště USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Smazat kartu SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Smazat všechna data v interním úložišti USB telefonu, například hudbu a fotografie."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Smazat všechna data na kartě SD telefonu, například hudbu a fotografie."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Resetovat telefon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"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" msgid="5390908019019242910">"Odstranit vše"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Proveďte gesto odemknutí"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Chcete-li potvrdit reset telefonu, musíte provést gesto odemknutí."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Pokus o reset se nezdařil, protože služba System Clear není dostupná."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Formátovat kartu SD"</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Vymaže všechna data na kartě SD"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Tato akce smaže kartu SD v telefonu. VŠECHNA data na kartě budou ztracena."</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"Formátovat kartu SD"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Formátování karty SD. Chcete smazat všechna svoje média? Akci nelze vrátit zpět."</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Smazat úložiště USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Smazat kartu SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Smaže data v úložišti USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Vymaže všechna data na kartě SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Tato akce smaže úložiště USB. Ztratíte "<b>"všechna"</b>" data v něm uložená."</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Tato akce vymaže kartu SD. "<b>"Všechna"</b>" data na kartě budou ztracena."</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Smazat úložiště USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Smazat kartu SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Chcete úložiště USB smazat a odstranit tak všechny soubory, které jsou v něm uloženy? Tuto akci nelze vrátit zpět."</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Chcete kartu SD smazat a odstranit tak všechny soubory, které jsou na ní uloženy? Tuto akci nelze vrátit zpět."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Odstranit vše"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Proveďte gesto odemknutí"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Formátování karty SD je potřeba potvrdit nakreslením odemykacího obrazce."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Smazání úložiště USB je třeba potvrdit pomocí bezpečnostního gesta."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Smazání karty SD je třeba potvrdit pomocí bezpečnostního gesta."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Nastavení hovorů"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavení hlasové schránky, přesměrování a čekání hovorů a ID volajícího"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering pomocí USB"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Chyba při tetheringu přes Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Maximální počet zařízení pro tethering: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"U zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude ukončeno sdílené připojení."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Nastavení tetheringu přes Bluetooth"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Vyberte zařízení Bluetooth k tetheringu."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Nápověda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilní sítě"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Nastavení roamingu, sítí a názvů přístupových bodů"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Použít systém A-GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Vylepšit funkčnost GPS pomocí serveru (deaktivací této funkce snížíte využití sítě)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Vylepšit funkčnost GPS pomocí serveru (zrušením této funkce zvýšíte výkon GPS)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Používat funkci Moje poloha"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Info o telefonu"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Zobrazuje právní informace, stav telefonu a verzi softwaru"</string>
     <string name="legal_information" msgid="5769301644270604095">"Právní informace"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Neznámé"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Seřadit dle jména"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Řadit podle velikosti"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Zobrazit spuštěné služby"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Zobrazit mezipaměť"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Správa paměti"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrovat"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Vyberte možnosti filtru"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Vše"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Stažené"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Spuštěné"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"Na kartě SD"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Úložiště USB"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na kartě SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktivováno"</string>
     <string name="no_applications" msgid="5190227407135243904">"Žádné aplikace."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Interní úložiště"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Úložiště USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Karta SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Přepočítávání velikosti..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Smazat"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Veškerá data (všechny soubory, nastavení, účty, databáze apod.) této aplikace budou trvale vymazána."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"verze <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Přesunout"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Přesunout do telefonu"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Přesunout na kartu SD"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Přesunout do úlož. USB"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Přesunout na kartu SD"</string>
     <string name="moving" msgid="6431016143218876491">"Přesouvání"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"V úložišti je nedostatek volného místa."</string>
     <string name="does_not_exist" msgid="837163572898468245">"Aplikace neexistuje."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferované umístění pro instalaci"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Změna preferovaného umístění pro instalaci nových aplikací"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Využití úložiště"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Zobrazit aplikacemi používané úložiště"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Spuštěné služby"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Umožňuje zobrazit a ovládat aktuálně spuštěné služby"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Probíhá restartování"</string>
+    <string name="cached" msgid="1059590879740175019">"Proces na pozadí v mezipaměti"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Nic není spuštěno."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Spuštěno aplikací."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"volné: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"používáno <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> volno"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"Využito <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Nastavení"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Tato služba byla spuštěna svou aplikací. Pokud ji zastavíte, může dojít k selhání aplikace."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Tuto aplikaci nelze bezpečně zastavit. Mohlo by dojít ke ztrátě části vaší aktuální práce."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Toto je starý proces aplikace zachovaný pro rychlejší spuštění v případě, že bude znovu potřeba. Zpravidla není důvod jej zastavovat."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: právě se používá. Ovládací prvky zobrazte dotykem na Nastavení."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Hlavní proces, který se používá."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Služba <xliff:g id="COMP_NAME">%1$s</xliff:g> se používá."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Poskytovatel <xliff:g id="COMP_NAME">%1$s</xliff:g> se používá."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Zastavit systémovou službu?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Opravdu tuto systémovou službu chcete zastavit? Může se stát, že telefon ztratí některé funkce. Ty nebudou fungovat, dokud telefon nevypnete a opět nezapnete."</string>
     <string name="language_settings" msgid="502219872342167227">"Jazyk a klávesnice"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Nastavení jazyka a klávesnice"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Nastavení jazyka"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Nastavení klávesnice"</string>
     <string name="phone_language" msgid="1165758957501090679">"Vyberte jazyk"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatické nahrazování"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Metoda zadávání dat"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Správa možností zadávání textu"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Nastavení modulu <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavení klávesnice na obrazovce"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Klávesnice zařízení"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Nastavení vestavěné klávesnice"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Vestavěná klávesnice"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Nastavení vestavěné fyzické klávesnice"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Vývoj"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Umožňuje nastavit možnosti pro vývoj aplikací"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Ladění USB"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"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, nikoli však hesla. Může také protokolovat 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í použít?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Deaktivovat usnadnění?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nebyly nalezeny žádné aplikace týkající se usnadnění"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nejsou nainstalovány žádné aplikace týkající se usnadnění přístupu."\n\n"Prostřednictvím služby Android Market můžete do svého zařízení stáhnout čtečku obrazovky."\n\n"Kliknutím na tlačítko OK čtečku obrazovky nainstalujete."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Skripty pro usnadnění přístupu"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Skripty pro usnadnění stahování"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Povolit aplikacím stahovat z Googlu skripty pro usnadnění přístupu."</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Některé aplikace mohou požádat Google o stažení skriptů, které usnadní přístup k obsahu dané aplikace. Opravdu chcete povolit Googlu, aby mohl do vašeho telefonu instalovat skripty pro usnadnění přístupu?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Tlačítko Napájení"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Tlačítko Napájení ukončuje hovor"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Stisknutí tlačítka Napájení během hovoru ukončí hovor místo vypnutí obrazovky"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Nabíjení"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Obrazovka zapnutá"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aktivní"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Probudit"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Signál telefonu"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Doba provozu zařízení"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"Doba provozu sítě WiFi"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"Doba provozu sítě WiFi"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Doba provozu modulu Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Doba provozu sítě Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Podrobnosti využití baterie"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti používání"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popředí"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázat režim spánku"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Připojení WiFi aktivní"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Odeslaná data"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Přijatá data"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informace o aplikaci"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Nastavení aplikací"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Nastavení zobrazení"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Nastavení WiFi"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Nastavení Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Nastavení Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Využití baterie hlasovými hovory"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Využití baterie v pohotovostním režimu telefonu"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Povolit aplikacím přístup k zabezpečeným certifikátům a dalším pověřením"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Zadejte heslo"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Zadejte heslo úložiště pověření."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Instalace z karty SD"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Nainstalovat šifrované certifikáty z karty SD"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalovat z úložiště USB"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalace z karty SD"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Instalovat šifrované certifikáty z úložiště USB"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Nainstalovat šifrované certifikáty z karty SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Nastavit heslo"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Nastavení nebo změna hesla úložiště pověření"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Vymazat úložiště"</string>
@@ -1165,7 +1224,7 @@
     <string name="credentials_disabled" msgid="7453188089059045380">"Úložiště pověření je deaktivováno."</string>
     <string name="encrypted_fs_category" msgid="1841367653663913956">"Systém souborů EFS (Encrypted File System)"</string>
     <string name="encrypted_fs_enable" msgid="3884033081603327729">"Šifrovat soukromá uživatelská data"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Aktivovat v tomto zařízení úložiště pro soukromá uživatelská data, které využívá šifrovaný systém souborů "</string>
+    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Aktivovat v tomto zařízení úložiště pro soukromá uživatelská data, které využívá šifrovaný systém souborů"</string>
     <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Aktivace systému souborů EFS vyžaduje vymazání dat ze zařízení."</string>
     <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Deaktivace systému souborů EFS vyžaduje vymazání dat ze zařízení."</string>
     <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Povolit"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Zálohování a obnovení"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobní údaje"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohovat moje data"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Zálohovat moje nastavení a další data aplikací."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Zálohovat data aplikací, hesla sítí Wi-Fi a další nastavení na serverech Google"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatické obnovení"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Pokud přeinstaluji aplikaci, chci obnovit zálohovaná nastavení a další data."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Pokud přeinstaluji aplikaci, chci obnovit zálohovaná nastavení a další data"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Záloha"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Opravdu chcete zrušit zálohování nastavení a dat aplikací a vymazat všechny kopie těchto dat na serverech Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Opravdu chcete zrušit zálohování hesel sítí Wi-Fi, záložek a dalších nastavení a dat aplikací a vymazat všechny kopie těchto dat na serverech Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavení správce zařízení"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Správce zařízení"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktivovat"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Aktualizovat seznam"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Přeskočit"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Další"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Vyhledávání sítí..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Dotykem vyberte síť"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Připojit k existující síti"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Zadejte konfiguraci sítě"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Připojit k nové síti"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Připojování..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Připojeno"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Pokračovat k dalšímu kroku"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Nastaly potíže se synchronizací. Služba bude brzy obnovena."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Přidat účet"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Obecná nastavení synchronizace"</string>
+    <string name="background_data" msgid="5779592891375473817">"Data na pozadí"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplikace mohou kdykoli synchronizovat, odesílat a přijímat data."</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Upozornění"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Deaktivace přenosu dat na pozadí šetří baterii a snižuje objem použitých dat. Některé aplikace mohou přesto datové připojení na pozadí používat."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Automatická synchronizace"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikace synchronizují data automaticky"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Spravovat účty"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synchronizace ZAP."</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchronizace VYP."</string>
+    <string name="sync_error" msgid="5060969083117872149">"Chyba synchronizace"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 336475c..309aa5c 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statisk"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Fra"</item>
     <item msgid="3165868966179561687">"Underretning"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3c62952..ce9e6a0 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Demonter SD-kort"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Formater SD-kort"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Demonter USB-lager"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Demonter SD-kort"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Slet USB-lager"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Slet SD-kort"</string>
     <string name="small_font" msgid="2295331917424072635">"Lille"</string>
     <string name="medium_font" msgid="2068475425515133701">"Normal"</string>
     <string name="large_font" msgid="599055175160971446">"Stor"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"SD-kort"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB-lager"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD-kort"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Batteristatus:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Strømstik:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Batteriskala:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Dødt"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Over spænding:"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ukendt fejl"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Søgbar"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Søgbar i <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunder ..."</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Start <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Konto:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Proxyindstillinger"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Angiv den globale HTTP-proxy og udeladelseslister"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Ryd"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Ingen proxy for"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Gendan standarder"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Udført"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Værtsnavn"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Bemærk"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Det indtastede værtsnavn er ikke gyldigt."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Den indtastede udeladelsesliste er ikke korrekt formateret. Indtast en kommaseparareret liste over udeladte domæner."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du skal udfylde portfeltet."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfeltet skal være tomt, hvis værtsfeltet er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Den indtastede port er ikke gyldig."</string>
@@ -189,16 +189,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Ændringerne træder i kraft, når USB-kablet tilsluttes igen"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Aktiver USB-masselagring"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Bytes i alt:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Der er intet SD-kort"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-lager ikke monteret"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Der er intet SD-kort"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Ledige bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"SD-kortet bruges som en masselagringsenhed"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"SD-kortet kan nu fjernes sikkert"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"SD-kortet blev fjernet, mens det stadig var i brug."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB bruges som masselager"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-kortet bruges som en masselagringsenhed"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-lager kan fjernes sikkert"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"SD-kortet kan nu fjernes sikkert"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-lager fjernet under brug!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD-kortet blev fjernet, mens det stadig var i brug."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Brugte bytes:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Scanner SD-kort efter medier ..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"SD-kortet er monteret som skrivebeskyttet"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Scanner USB-lager for medier…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Scanner SD-kort efter medier ..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-lager er skrivebeskyttet"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD-kortet er monteret som skrivebeskyttet"</string>
+    <string name="skip_label" msgid="47510779345218297">"Skip"</string>
     <string name="next_label" msgid="4693520878012668114">"Næste"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Sprog"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Vælg aktivitet"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Batterioplysninger"</string>
     <string name="display_label" msgid="7403874003169865762">"Visning"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Telefonoplysninger"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"SD-kort"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-lager"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxyindstillinger"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuller"</string>
     <string name="settings_label" msgid="1626402585530130914">"Indstillinger"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Indstillinger"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Indstillinger"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flytilstand"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Deaktiver alle trådløse forbindelser"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Vælg en netværksudbyder"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dato og tid"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Angiv dato, tid, tidszone og formater"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatisk dato og tid"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Brug netværkets tid"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Brug netværkets tid"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatisk tidszone"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Brug netværkets tidszone"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Brug netværkets tidszone"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Brug 24-timers format"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Angiv tid"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Vælg tidszone"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorter efter tidszone"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Lås enheden efter timeout"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Juster forsinkelsen, inden enheden automatisk låses"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Placering og sikkerhed"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Indstillinger for placering og sikkerhed"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låsning af SIM-kort og oplysningslagring"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuller"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Enhedsadministration"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Vælg enhedsadministratorer"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Tilføj eller fjern enhedsadministratorer"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Vælg enhedsadministratorer"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Tilføj eller fjern enhedsadministratorer"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Slå Bluetooth til"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Indstillinger for Bluetooth"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som højttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Til musik og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk indstillinger"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Brug Near Field Communication til at læse og udveksle tags"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Slå Wi-Fi til"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Indstillinger for Wi-Fi"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Opret forbindelse til netværk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Glem netværk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Rediger netværk"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Netværkskonfiguration"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Indtast pin via adgangspunkt"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"Netværk-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhed"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Adgangskode"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Vis adgangskode"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-indstillinger"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(uændret)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ikke specificeret)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Husket"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Deaktiveret"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ikke inden for rækkevidde"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Sikret med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Sikret med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Sikret med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS tilgængelig)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, sikret med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Forbind"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glem"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP-indstillinger"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Gem"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Annuller"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Indtast en gyldig IP-adresse."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Netmask"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Bærbart Wi-Fi-hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Det bærbare hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktivt"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fejl ved bærbart Wi-Fi-hotspot"</string>
@@ -489,7 +508,7 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Lyd ved valg"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Afspil lyd, når der foretages et valg på skærmen"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Afspil lyd, når der foretages et valg på skærmen"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Lyde ved skærmlås "</string>
+    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Lyde ved skærmlås"</string>
     <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Afspil lyde, når skærmen låses og låses op"</string>
     <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Afspil lyde, når skærmen låses og låses op"</string>
     <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Feedback ved berøring"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Telefonnummer, signal osv."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Demonter SD-kort, vis ledig lagerplads"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Lag. af delt og sik. huk."</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Lagerplads"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Indstillinger for lager"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Demonter USB-lager, vis ledig lagerplads"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Demonter SD-kort, vis ledig lagerplads"</string>
     <string name="status_number" msgid="5123197324870153205">"Mit telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-version"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Utilgængelig"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oppetid"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Opvågningstid"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Intern lagerplads på telefonen"</string>
-    <string name="sd_memory" msgid="151871913888051515">"SD-kort"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Internt lager"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lager"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kort"</string>
     <string name="memory_available" msgid="418542433817289474">"Ledig plads"</string>
     <string name="memory_size" msgid="6629067715017232195">"Plads i alt"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Demonter SD-kort"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Demonter SD-kortet til sikker fjernelse"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demonter delt hukommelse"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Demonter SD-kort"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demonter det interne USB-lager"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Demonter SD-kortet for at fjerne det sikkert"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Aktiver PTP-tilstand"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Vises på USB som en PTP-kameraenhed i stedet for en MTP-enhed"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Insæt et SD-kort, der skal monteres"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Montér SD-kort"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Montér SD-kortet"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Formater SD-kort"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Formater (slet) SD-kortet"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Isæt USB-lager til mont."</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insæt et SD-kort, der skal monteres"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Isæt delt hukommelse"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Montér SD-kort"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Monter det interne USB-lager"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Montér SD-kortet"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Slet USB-lager"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Slet SD-kort"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Sletter alle data på telefonens interne USB-lager, f.eks. musik og billeder."</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Sletter alle data på telefonens SD-kort, f.eks. musik og billeder"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Utilgængelig"</string>
     <string name="read_only" msgid="6702420168629076340">" (Skrivebeskyttet)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Demonter SD-kort"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Hvis du demonterer SD-kortet, vil nogle af de programmer, som du bruger, stoppe, og de kan være utilgængelige, indtil du monterer SD-kortet igen."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Demonteringen af SD-kortet mislykkedes"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"SD-kortet kan ikke demonteres. Prøv igen senere. "</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"SD-kortet demonteres. Se status i meddelelsesområdet."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Demonter USB-lager"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Demonter SD-kort"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Hvis du demonterer USB-lager, vil nogle af de programmer, som du bruger, stoppe, og de kan være utilgængelige, indtil du monterer USB-lager igen."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Hvis du demonterer SD-kortet, vil nogle af de programmer, som du bruger, stoppe, og de kan være utilgængelige, indtil du monterer SD-kortet igen."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Demontering af USB mislykkedes"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Demonteringen af SD-kortet mislykkedes"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"USB-lager kan ikke demonteres. Prøv igen senere."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"SD-kortet kan ikke demonteres. Prøv igen senere."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-lager demonteres."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-kort bliver demonteret."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Demontering"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Demontering i gang"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Nulstillingen af APN-standardindstillinger er afsluttet"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Gendannelse af fabriksdata"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Sletter alle data på telefonen"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Dette sletter alle data fra din telefon, inklusive :"\n<li>"Din Google-konto"</li>\n<li>"System- og programdata samt indstillinger"</li>\n<li>"Downloadede programmer"</li>\n"Det sletter ikke:"\n<li>"Nuværende systemsoftware og programbundter"</li>\n<li>"SD-kortfiler, som f.eks. musik og fotos"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", bl.a.:"\n\n<li>"din Google-konto"</li>\n<li>"system- og programdata og -indstillinger"</li>\n<li>"downloadede programmer"</li>\n\n"Slet musik, billeder og andre brugerdata ved også at slette "<b>"USB-lager"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", bl.a. :"\n\n<li>"din Google-konto"</li>\n<li>"system- og programdata og -indstillinger"</li>\n<li>"downloadede programmer"</li>\n\n"Slet musik, billeder og andre brugerdata ved også at slette "<b>"SD-kortet"</b>"."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Slet USB-lager"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Slet SD-kort"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Slet alle data på telefonens interne USB-lager, f.eks. musik og billeder."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Slet alle data på telefonens SD-kort, f.eks. musik og billeder."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Nulstil telefon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Slet alle dine personlige oplysninger og downloadede programmer? Denne handlíng kan ikke fortrydes."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Slet alt"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Tegn dit oplåsningsmønster"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Du skal tegne dit oplåsningsmønster for at bekræfte, at telefonen nulstilles."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Der blev ikke foretaget nogen nulstilling, fordi tjenesten Systemoprydning ikke er tilgængelig."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Formater SD-kort."</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Sletter alle data på SD-kortet"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Denne handling rydder det SD-kort, der sidder i telefonen. Du mister ALLE data på kortet!"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"Formater SD-kort"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Vil du formatere dit SD-kort og slette alle dine medier? Handlingen kan ikke annulleres."</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Slet USB-lager"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Slet SD-kort"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Sletter alle data i USB-lager"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Sletter alle data på SD-kortet"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Denne handling sletter USB-lager. Du mister "<b>"alle"</b>" data!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Denne handling rydder SD-kortet. Du mister "<b>"alle"</b>" data på kortet!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Slet USB-lager"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Slet SD-kort"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Vil du slette USB-lager og alle filer, som er gemt der? Handlingen kan ikke fortrydes!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Vil du slette SD-kort og alle filer, som er gemt der? Handlingen kan ikke fortrydes!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Slet alt"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Tegn dit oplåsningsmønster"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Du skal tegne dit oplåsningsmønster for at bekræfte et SD-kortformat."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette USB-lager."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette SD-kortet."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Indstillinger for opkald"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Opsæt voicemail, viderestilling af opkald, ventende opkald, opkalds-id"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tethering"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Fejl ved Bluetooth-tethering"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Tethering kan ikke bruges til mere end <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheder"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering til <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil blive afbrudt."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Indstillinger for Bluetooth-tethering"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Vælg Bluetooth-enheder til tethering"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjælp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilnetværk"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Angiv indstillinger for roaming, netværk, APN\'er"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Brug assisteret GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Brug serveren til at assistere GPS (fjern markering for at mindske netværksforbrug)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Brug serveren til at assistere GPS (fjern markering for at forbedre GPS-ydelsen)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Brug Min placering"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Om telefonen"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Vis juridiske oplysninger, telefonstatus, softwareversion"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridiske oplysninger"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Ukendte"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sorter efter navn"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sorter efter størrelse"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Vis kørende tjenester"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Cachelagrede processer"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrer plads"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Vælg indstillinger for filtret"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Overført"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kørende"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"På SD-kort"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lager"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktiveret"</string>
     <string name="no_applications" msgid="5190227407135243904">"Ingen programmer."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Internt lager"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lager"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortlager"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Beregner størrelse igen ..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Slet"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Alle dette programs data slettes permanent. Det omfatter alle filer, indstillinger, konti, databaser osv."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Flyt"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Flyt til telefon"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Flyt til SD-kort"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Flyt til USB-lager"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Flyt til SD-kort"</string>
     <string name="moving" msgid="6431016143218876491">"Flytter"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Der er ikke nok lagerplads tilbage."</string>
     <string name="does_not_exist" msgid="837163572898468245">"Programmet eksisterer ikke."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Foretrukken installationsplacering"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Skift den foretrukne installationsplacering for nye programmer."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Lagerforbrug"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Vis lagerplads, der bruges af programmer"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kørende tjenester"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Vis og kontroller kørende tjenester"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Genstarter"</string>
+    <string name="cached" msgid="1059590879740175019">"Cachelagret baggrundsproces"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Intet kører."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Startet af program."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> ledig"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> i brug"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> ledig"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> brugt"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjeneste"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Indstillinger"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Denne tjeneste er startet af dens program. Hvis du stopper den, mislykkes programmet."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Dette program kan ikke stoppes på en sikker måde. Det kan slette noget af dit seneste arbejde."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Dette er en gammel programproces, der beholdes for større hastighed, hvis der bliver brug for den igen. Der er normalt ingen grund til at stoppe den."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: aktuelt i brug. Tryk på Indstillinger for at håndtere."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Den hovedproces, der er i brug."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Tjenesten <xliff:g id="COMP_NAME">%1$s</xliff:g> er i brug."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Udbyderen <xliff:g id="COMP_NAME">%1$s</xliff:g> er i brug."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Stop systemtjeneste?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Er du sikker på, at du vil stoppe denne systemtjeneste? Hvis du gør, kan nogle af funktionerne på din telefon holde op med at fungere korrekt, indtil du slukker og tænder igen."</string>
     <string name="language_settings" msgid="502219872342167227">"Sprog og tastatur"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Indstillinger for sprog og tastatur"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Sprogindstillinger"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Indstillinger for tastatur"</string>
     <string name="phone_language" msgid="1165758957501090679">"Vælg sprog"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatisk erstatning"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Inputmetode"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Administrer valgmuligheder for tekstinput"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-indstillinger"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Indstillinger for skærmens tastatur"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Enhedens tastatur"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Indstillinger for indbygget tastatur"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Indbygget tastatur"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Indstillinger for indbygget fysisk tastatur"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Udvikling"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Angiv indstillinger for programudvikling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-fejlretning"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Denne tilgængelighedstjeneste vil muligvis være i stand til at indsamle al den tekst, du indtaster, inklusive personlige data, kreditkortoplysninger undtagen adgangskoder. Den kan også registrere dine interaktioner med brugergrænsefladen. Den kommer fra programmet <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Vil du aktivere denne tilgængelighedstjeneste?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Deaktiver tilgængelighed?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Der blev ikke fundet programmer med relateret tilgængelighed"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Du har ingen tilgængelighedsprogrammer."\n\n"Du kan downloade en skærmlæser på Android Marked."\n\n"Klik på OK for at installere skærmlæseren."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Tilgængelighedsscripts"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Download tilgængelighedsscripts"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Tillad, at programmer henter tilgængelighedsscripts fra Google"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Nogle programmer kan bede Google om at downloade scripts til din telefon, som gør deres indhold mere tilgængeligt. Vil du tillade, at Google installerer tilgængelighedsscripts på din telefon?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Afbryderknap"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Afbryderknappen afslutter opkaldet"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Hvis du trykker på Sluk under et opkald, afsluttes opkaldet i stedet for at slukke skærmen"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Oplader"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skærm til"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS slået til"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefonsignal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Enhedens opvågningstid"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"Wi-Fi til tiden"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"Wi-Fi til tiden"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi til tiden"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi til tiden"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Oplysninger om batteriforbrug"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Brugsdetaljer"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU forgrund"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hold aktiv"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi aktiv"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data sendt"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Data modtaget"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Programoplysninger"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Indstillinger for programmer"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Indstillinger for visning"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Indstillinger for Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Indstillinger for Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Indstillinger for Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batteri brugt af stemmeopkald"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Batteri brugt, når telefon ikke er aktiv"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Giv programmer adgang til sikre certifikater og andre oplysninger"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Indtast adgangskode"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Indtast adgangskoden til oplysningslagringen."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Installer fra SD-kort"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Installer krypterede certifikater fra SD-kortet"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installer fra USB-lager"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installer fra SD-kort"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Installer krypt. cert. fra USB"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Installer krypterede certifikater fra SD-kortet"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Angiv adgangskode"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Angiv eller skift adgangskode til oplysningslagringen"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Ryd lager"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Sikkerhedskopiering og gendannelse"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige oplysninger"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopier mine data"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Sikkerhedskopier mine indstillinger og andre programdata."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Sikkerhedskopier programdata, Wi-Fi-adgangskoder og andre indstillinger på Googles servere"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk gendannelse"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Hvis jeg geninstallerer et program, skal sikkerhedskopierede indstillinger eller andre data gendannes."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Hvis jeg geninstallerer et program, skal sikkerhedskopierede indstillinger eller andre data gendannes"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sikkerhedskopi"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Er du sikker på, at du vil holde op med at sikkerhedskopiere dine indstillinger og programdata og slette alle kopier på Googles servere?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Er du sikker på, at du vil afbryde sikkerhedskopieringen af dine Wi-Fi-adgangskoder, bogmærker og andre indstillinger og slette alle kopier på Googles servere?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Enhedsadministrationsindstillinger"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Enhedsadministrator"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiver"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Opdater liste"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Spring over"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Næste"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Scanner netværk..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Tryk for at vælge netværk"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Opret forbindelse til eksisterende netværk"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Angiv netværkskonfiguration"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Opret forbindelse til nyt netværk"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Opretter forbindelse..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Tilsluttet"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Fortsæt til næste trin"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Der er i øjeblikket problemer med synkroniseringen. Den etableres igen om lidt."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Tilføj konto"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Synkroniseringsindstillinger"</string>
+    <string name="background_data" msgid="5779592891375473817">"Baggrundsdata"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Programmer kan altid synkronisere, sende og modtage data"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Bemærk"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Deaktivering af baggrundsdata forlænger batteriets levetid og mindsker databrug. Nogle programmer kan muligvis stadig bruge baggrundsdataforbindelsen."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Automatisk synkronisering"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Programmer synkroniserer data automatisk"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Administrer konti"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synkronisering til"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synkronisering slået fra"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Synkroniseringsfejl"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index e23787f..c84665b 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statisch"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Aus"</item>
     <item msgid="3165868966179561687">"Benachrichtigung"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b22bde9..d052c8e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"ASU"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"SD-Karte entnehmen"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"SD-Karte formatieren"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"USB-Speicher trennen"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD-Karte entnehmen"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB-Speicher löschen"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD-Karte löschen"</string>
     <string name="small_font" msgid="2295331917424072635">"Klein"</string>
     <string name="medium_font" msgid="2068475425515133701">"Mittel"</string>
     <string name="large_font" msgid="599055175160971446">"Groß"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"SD-Karte"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB-Speicher"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD-Karte"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Akkustatus:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Stromanschluss:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Akkuanzeige:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Leer"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Überspannung"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Unbekannter Fehler"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Sichtbar"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Für <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> Sekunden erkennbar..."</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> starten"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Konto:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Proxy-Einstellungen"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Globalen HTTP-Proxy und Ausschlusslisten festlegen"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Löschen"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Kein Proxy für"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Standard wiederherstellen"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Fertigstellen"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Hostname"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Achtung"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Der eingegebene Hostname ist ungültig."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Die von Ihnen eingegebene Ausschlussliste ist nicht richtig formatiert. Bitte geben Sie eine durch Kommas getrennte Liste ausgeschlossener Domains ein."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Sie müssen das Feld für den Port ausfüllen."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Das Feld für den Port muss leer sein, wenn das Feld für den Host leer ist."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Der eingegebene Port ist ungültig."</string>
@@ -189,16 +189,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Die Änderungen werden nach dem erneuten Anschließen des USB-Kabels übernommen."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB-Massenspeicher aktivieren"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Bytes insgesamt:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Keine SD-Karte"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-Speicher nicht bereitgest."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Keine SD-Karte"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Verfügbare Bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"SD-Karte wird als Massenspeichergerät verwendet"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"Die SD-Karte kann jetzt entfernt werden."</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"Die SD-Karte wurde während der Verwendung entfernt!"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-Speicher wird als Massenspeicher verwendet"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-Karte wird als Massenspeichergerät verwendet"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-Speicher kann nun entfernt werden"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Die SD-Karte kann jetzt entfernt werden."</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-Speicher wurde während Verw. entfernt."</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Die SD-Karte wurde während der Verwendung entfernt!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Verwendete Bytes:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"SD-Karte wird auf Medien gescannt..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"SD-Karte schreibgeschützt aktiviert"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB-Sp. auf Medien scannen"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD-Karte wird auf Medien gescannt..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-Speicher schreibgeschützt"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD-Karte schreibgeschützt aktiviert"</string>
+    <string name="skip_label" msgid="47510779345218297">"Ohne"</string>
     <string name="next_label" msgid="4693520878012668114">"Weiter"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Sprache"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Aktion auswählen"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Akkuinfo"</string>
     <string name="display_label" msgid="7403874003169865762">"Display"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Telefoninfo"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"SD-Karte"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-Speicher"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-Karte"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-Einstellungen"</string>
     <string name="cancel" msgid="6859253417269739139">"Abbrechen"</string>
     <string name="settings_label" msgid="1626402585530130914">"Einstellungen"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Ein- stellungen"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Einstellungen"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flugmodus"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Alle drahtlosen Verbindungen deaktivieren"</string>
@@ -217,7 +224,7 @@
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Drahtlosverbindungen werden aktiviert..."</string>
     <string name="radio_controls_title" msgid="5868688473587168882">"Drahtlos &amp; Netzwerke"</string>
     <string name="wireless_networks_settings_title" msgid="149274247949769551">"Einstellungen für Drahtlosnetzwerke"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"WLAN, Bluetooth, Flugmodus, mobile Netzwerke und VPNs verwalten"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"WLAN, Bluetooth, Flugmodus, Mobilfunknetze und VPNs verwalten"</string>
     <string name="roaming" msgid="3596055926335478572">"Daten-Roaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Bei Roaming mit Datendienst verbinden"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Bei Roaming mit Datendienst verbinden"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Netzbetreiber auswählen"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum &amp; Uhrzeit"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Datum, Uhrzeit, Zeitzone und Formate festlegen"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatisches Datum &amp; Uhrzeit"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Vom Netzwerk angegebene Zeitzone verwenden"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Zeit aus Netzwerk beziehen"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatische Zeitzone"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Vom Netzwerk angegebene Zeitzone beibehalten"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Vom Netzwerk angegebene Zeitzone beibehalten"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-Stunden-Format"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Uhrzeit festlegen"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Zeitzone auswählen"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Nach Zeitzone sortieren"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Gerät nach Timeout sperren"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Dauer bis zur automatischen Sperrung des Geräts anpassen"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Standort &amp; Sicherheit"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Einstellungen für Standort &amp; Sicherheit"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldeinformationsspeicher festlegen"</string>
@@ -265,9 +270,9 @@
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Muster"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Muster zum Entsperren des Displays zeichnen"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Geben Sie eine numerische PIN zum Entsperren ein."</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Numerische PIN zum Entsperren des Displays eingeben"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passwort"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Geben Sie ein Passwort zum Entsperren des Displays ein."</string>
+    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Passwort zum Entsperren des Displays eingeben"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Vom Remote-Telefonadministrator deaktiviert"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Display-Sperre deaktivieren"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Entsperrungsmuster entfernen"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Abbrechen"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Geräteverwaltung"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Geräte-Administratoren"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Geräteadministratoren hinzufügen oder entfernen"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Geräte-Administratoren"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Geräteadministratoren hinzufügen oder entfernen"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth aktivieren"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-Einstellungen"</string>
@@ -327,7 +332,7 @@
     <string name="bluetooth_device_info" msgid="6644515376523965073">"Bluetooth-Geräteinfo"</string>
     <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"PIN für Pairing mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eingeben. Versuchen Sie 0000 oder 1234."</string>
     <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Schlüssel zum Pairing mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eingeben."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Bestätigen Sie zum Paaren mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", dass der folgende Schlüssel angezeigt wird: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Bestätigen Sie zum Paaren mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", dass es den folgenden Schlüssel anzeigt: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"möchte sich paaren."</string>
     <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Geben Sie zum Pairing <xliff:g id="PASSKEY">%2$s</xliff:g> in \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ein."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Paaren"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als Lautsprechertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Für Musik und Medien"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Einstellungen speichern"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Nahfeldkommunikation zum Lesen und Austauschen von Tags verwenden"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WLAN"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"WLAN aktivieren"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"WLAN-Einstellungen"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Mit Netzwerk verbinden"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Netzwerk entfernen"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netzwerk ändern"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Netzwerkeinrichtung"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"PIN vom Zugriffspunkt eingeben"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"Netzwerk-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sicherheit"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identität"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme Identität"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Passwort"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Passwort anzeigen"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-Einstellungen"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nicht geändert)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(keine Angabe)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Gespeichert"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Deaktiviert"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Nicht in Reichweite"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Gesichert mit <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Gesichert mit <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Gesichert mit <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS verfügbar)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, gesichert mit <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Entfernen"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP-Einstellungen"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Speichern"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Abbrechen"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Bitte geben Sie eine gültige IP-Adresse ein."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Netmask"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobiler WLAN-Hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobiler Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fehler beim mobilen WLAN-Hotspot"</string>
@@ -460,7 +479,7 @@
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Toneinstellungen"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Lautlosmodus"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"Alle Töne (außer für Medienwiedergabe &amp; Wecker) stummschalten"</string>
+    <string name="silent_mode_summary" msgid="3309650676072917899">"Alle Töne (außer für Wecker &amp; Medienwiedergabe) stummschalten"</string>
     <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Alle Sounds außer Medien sind stumm geschaltet"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Klingelton"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
@@ -509,7 +528,7 @@
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Ton bei Dock-Anschluss"</string>
     <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Beim Anschließen oder Trennen des Telefons vom Dock Ton abspielen"</string>
     <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Beim Anschließen oder Trennen des Telefons vom Dock keinen Ton abspielen"</string>
-    <string name="sync_settings" msgid="9186125469300013491">"Konten&amp;Synchronisierung"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Konten &amp; Synchr."</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Konten hinzufügen und entfernen und Kontoeinstellungen ändern"</string>
     <string name="search_settings" msgid="1910951467596035063">"Suche"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Sucheinstellungen und Suchverlauf verwalten"</string>
@@ -558,17 +577,17 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Telefonnummer, Signal usw."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"SD-Karte entnehmen, verfügbaren Speicher anzeigen"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Freig./sicherer Speicher"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Speicher"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Speichereinstellungen"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB-Speicher trennen, verfügbaren Speicher anzeigen"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD-Karte entnehmen, verfügbaren Speicher anzeigen"</string>
     <string name="status_number" msgid="5123197324870153205">"Meine Telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-Version"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
-    <string name="status_network_type" msgid="3279383550222116235">"Mobiler Netzwerktyp"</string>
-    <string name="status_data_state" msgid="5503181397066522950">"Mobiler Netzwerkstatus"</string>
+    <string name="status_network_type" msgid="3279383550222116235">"Art des Mobilfunknetzes"</string>
+    <string name="status_data_state" msgid="5503181397066522950">"Status des Mobilfunknetzes"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Servicestatus"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Signalstärke"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Nicht verfügbar"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Betriebszeit"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktivzeit"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Interner Telefonspeicher"</string>
-    <string name="sd_memory" msgid="151871913888051515">"SD-Karte"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Interner Speicher"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-Speicher"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD-Karte"</string>
     <string name="memory_available" msgid="418542433817289474">"Verfügbarer Speicher"</string>
     <string name="memory_size" msgid="6629067715017232195">"Gesamtspeicher"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"SD-Karte entnehmen"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"SD-Karte sicher entfernen"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Freig. Speicher trennen"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-Karte entnehmen"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Internen USB-Speicher trennen"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD-Karte trennen, damit Sie sie sicher entfernen können"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"PTP-Modus aktivieren"</string>
-    <string name="ptp_mode_summary" msgid="8709697530987890394">"Auf USB statt MTP-Gerät als PTP-Kameragerät anzeigen"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"SD-Karte zur Bereitstellung einlegen"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"SD-Karte bereitstellen"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"SD-Karte bereitstellen"</string>
-    <string name="sd_format" msgid="5448738337382712203">"SD-Karte formatieren"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"SD-Karte formatieren (löschen)"</string>
+    <string name="ptp_mode_summary" msgid="8709697530987890394">"Über USB als PTP-Kameragerät statt als MTP-Gerät ausgeben"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"USB-Sp. für Bereitst. einlegen"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"SD-Karte zur Bereitstellung einlegen"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Speicher bereitstellen"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"SD-Karte bereitstellen"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Int. USB-Speicher bereitst."</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"SD-Karte bereitstellen"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB-Speicher löschen"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"SD-Karte löschen"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Löscht alle Daten, z. B. Musik und Fotos, aus d. int. USB-Speicher d. Telefons"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Löscht sämtliche Daten, beispielsweise Musik und Fotos, von der SD-Karte des Telefons."</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Nicht verfügbar"</string>
     <string name="read_only" msgid="6702420168629076340">" (schreibgeschützt)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"SD-Karte entnehmen"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Wenn Sie die SD-Karte entfernen, werden einige von Ihnen verwendete Anwendungen angehalten und sind nicht mehr verfügbar, bis Sie die SD-Karte wieder einsetzen."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Fehler beim Entfernen der SD-Karte"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"SD-Karte kann nicht entfernt werden. Versuchen Sie es später erneut."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"SD-Karte wird getrennt. Überprüfen Sie den Status im Benachrichtigungsfeld."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"USB-Speicher trennen"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"SD-Karte entnehmen"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Wenn Sie den USB-Speicher trennen, werden einige von Ihnen verwendete Anwendungen angehalten. Diese stehen möglicherweise erst dann wieder zur Verfügung, wenn Sie den USB-Speicher wieder bereitstellen."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Wenn Sie die SD-Karte entfernen, werden einige von Ihnen verwendete Anwendungen angehalten und sind nicht mehr verfügbar, bis Sie die SD-Karte wieder einsetzen."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Trennen von USB-Sp. fehlg."</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Fehler beim Entfernen der SD-Karte"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"USB-Speicher kann nicht getrennt werden. Versuchen Sie es später noch einmal."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"SD-Karte kann nicht entfernt werden. Versuchen Sie es später erneut."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-Speicher wird getrennt."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-Karte wird getrennt."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Trennen..."</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Trennung..."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akkustatus"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Zurücksetzen auf Standard-APN-Einstellungen abgeschlossen"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Auf Werkszustand zurück"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Löscht alle Daten auf dem Telefon"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Hierdurch werden alle Daten von Ihrem Telefon gelöscht, darunter"\n<li>"Ihr Google-Konto,"</li>\n<li>"System- und Anwendungsdaten sowie entsprechende Einstellungen"</li>\n<li>"und heruntergeladene Anwendungen."</li>\n"Folgendes wird nicht gelöscht:"\n<li>"Aktuelle Systemsoftware und gebündelte Anwendungen"</li>\n<li>"Auf einer SD-Karte gespeicherte Dateien wie Musik oder Fotos"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Telefons gelöscht, einschließlich"\n\n<li>"der System- und Anwendungsdaten und -einstellungen Ihres Google-Kontos"</li>\n<li></li>\n<li>"heruntergeladener Anwendungen"</li>\n\n"Um sämtliche Daten auf diesem Telefon zu löschen, müssen Sie den "<b>"USB-Speicher"</b>" löschen."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Telefons gelöscht, einschließlich"\n\n<li>"der System- und Anwendungsdaten und -einstellungen Ihres Google-Kontos"</li>\n<li></li>\n<li>"heruntergeladener Anwendungen"</li>\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, müssen Sie die "<b>"SD-Karte"</b>" löschen."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-Speicher löschen"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-Karte löschen"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Löscht alle Daten, z. B. Musik und Fotos, aus dem int. USB-Speicher des Telefons"</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Alle Daten, z. B. Musik und Fotos, von der SD-Karte löschen"</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Telefon zurücksetzen"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"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" msgid="5390908019019242910">"Alles löschen"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen des Telefons zu bestätigen."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Die Zurücksetzung konnte nicht durchgeführt werden, da der Service zur Systembereinigung nicht verfügbar ist."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"SD-Karte formatieren"</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Löscht alle Daten auf der SD-Karte"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Durch diese Aktion wird die SD-Karte im Telefon gelöscht. Sie verlieren dann ALLE Daten auf der Karte!"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"SD-Karte formatieren"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"SD-Karte formatieren und alle Medien löschen? Die Aktion kann nicht rückgängig gemacht werden!"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-Speicher löschen"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"SD-Karte löschen"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Löscht alles im USB-Speicher."</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Löscht alle Daten auf der SD-Karte"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Hierdurch wird der USB-Speicher gelöscht. "<b>"Alle"</b>" darin befindlichen Daten gehen dann verloren!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Durch diese Aktion wird die SD-Karte gelöscht. "<b>"Alle"</b>" Daten auf der Karte gehen dann verloren!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"USB-Speicher löschen"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"SD-Karte löschen"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"USB-Speicher und alle darauf gespeicherten Dateien löschen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"SD-Karte und alle darauf gespeicherten Dateien löschen? Die Aktion kann nicht rückgängig gemacht werden!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Alles löschen"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Sie müssen Ihr Entsperrungsmuster eingeben, um eine SD-Karten-Formatierung zu bestätigen."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Sie müssen Ihr Entsperrungsmuster zeichnen, um die Löschung des USB-Speichers zu bestätigen."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Sie müssen Ihr Entsperrungsmuster zeichnen, um das Löschen der SD-Karte zu bestätigen."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Anrufeinstellungen"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Mailbox, Rufweiterleitung, Anklopfen, Anruferkennung einrichten"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-Tethering"</string>
@@ -680,23 +723,26 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluethooth-Tethering-Fehler"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Tethering nur für maximal <xliff:g id="MAXCONNECTION">%1$d</xliff:g> Geräte möglich"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering für <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird deaktiviert."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Einstellungen für Bluetooth-Tethering"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Bluetooth-Geräte für Tethering auswählen"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hilfe"</string>
-    <string name="network_settings_title" msgid="7967552516440151852">"Mobile Netzwerke"</string>
+    <string name="network_settings_title" msgid="7967552516440151852">"Mobilfunknetze"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Optionen für Roaming, Netzwerke, APNs festlegen"</string>
     <string name="location_title" msgid="1029961368397484576">"Mein Standort"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Drahtlosnetzwerke"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Standort über Drahtlosnetzwerke bestimmen (z. B. in Google Maps)"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Standort bestimmt von WLAN und/oder mobilen Netzwerken"</string>
+    <string name="location_neighborhood_level" msgid="4656658097932515921">"Standort bestimmt von WLAN und/oder Mobilfunknetzen"</string>
     <string name="location_gps" msgid="6296125378829097831">"GPS-Satelliten"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Genau auf Straßenebene lokalisieren"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Auf Straßenebene lokalisieren (höherer Akkuverbrauch, im Freien)"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Unterstütztes GPS verwenden"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Server zur Unterstützung von GPS verwenden (zur Verringerung der Netzwerkauslastung nicht auswählen)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Server zur Unterstützung von GPS verwenden (zur Verbesserung der GPS-Leistung deaktivieren)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Standort verwenden"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Telefoninfo"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Rechtliche Hinweise, Telefonstatus und Softwareversion anzeigen"</string>
     <string name="legal_information" msgid="5769301644270604095">"Rechtliche Hinweise"</string>
@@ -781,19 +827,25 @@
     <string name="app_factory_reset" msgid="6635744722502563022">"Updates deinstallieren"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Sie haben diese Anwendung für einige Aktionen als Standard festgelegt."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Kein Standard"</string>
-    <string name="clear_activities" msgid="7408923511535174430">"Standardeinstellung löschen"</string>
+    <string name="clear_activities" msgid="7408923511535174430">"Standardeinstellung zurücksetzen"</string>
     <string name="unknown" msgid="1592123443519355854">"Unbekannt"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Nach Namen sortieren"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Nach Größe sortieren"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Aktive Dienste anzeigen"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Prozesse im Cache anz."</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Speicherplatz verwalten"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Filteroptionen auswählen"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
-    <string name="filter_apps_third_party" msgid="7786348047690140979">"Heruntergeladen"</string>
-    <string name="filter_apps_running" msgid="7767071454371350486">"Wird ausgeführt"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"Auf SD-Karte"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Heruntergeladene"</string>
+    <string name="filter_apps_running" msgid="7767071454371350486">"Ausgeführte"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-Speicher"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Auf SD-Karte"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktiviert"</string>
     <string name="no_applications" msgid="5190227407135243904">"Keine Anwendungen"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Interner Speicher"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-Speicher"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-Kartensp."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Größe wird neu berechnet..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Löschen"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"All diese Anwendungsdaten werden dauerhaft gelöscht. Dazu zählen alle Dateien, Einstellungen, Konten, Datenbanken und so weiter."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Verschieben"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Auf Telefon verschieben"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Auf SD-Karte verschieben"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"In USB-Speicher versch."</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Auf SD-Karte verschieben"</string>
     <string name="moving" msgid="6431016143218876491">"Verschieben"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Es ist nicht genügend Speicher vorhanden."</string>
     <string name="does_not_exist" msgid="837163572898468245">"Diese Anwendung existiert nicht."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Bevorzugter Installationspfad"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Bevorzugten Installationspfad für neue Anwendungen ändern"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Speichernutzung"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Von Anwendungen verwendeten Speicher anzeigen"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktive Dienste"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Derzeit ausgeführte Dienste anzeigen und steuern"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Neustart wird durchgeführt."</string>
+    <string name="cached" msgid="1059590879740175019">"Hintergrundprozess im Cache"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Nichts wird ausgeführt."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Von der Anwendung gestartet."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> verfügbar"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> wird verwendet"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> frei"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> verw."</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> Prozess und <xliff:g id="NUMSERVICES">%2$d</xliff:g> Dienst"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Einstellungen"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Dieser Dienst wurde von seiner Anwendung gestartet. Wird er beendet, kann die Anwendung eventuell nicht mehr ausgeführt werden."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Diese Anwendung kann nicht sicher beendet werden. Beim Beenden könnten aktuelle Daten verloren gehen."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Hierbei handelt es sich um einen alten Anwendungsprozess, der zur Erzielung einer besseren Geschwindigkeit für den Fall, dass er benötigt wird, beibehalten wird. Normalerweise gibt es keinen Grund, warum er beendet werden sollte."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: wird derzeit verwendet. Berühren Sie zum Steuern die Einstellungen."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Hauptprozess, der verwendet wird."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Dienst <xliff:g id="COMP_NAME">%1$s</xliff:g> wird verwendet."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Anbieter <xliff:g id="COMP_NAME">%1$s</xliff:g> wird verwendet."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Systemdienst beenden?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Möchten Sie diesen Systemdienst wirklich beenden? Möglicherweise funktionieren dann einige Funktionen Ihres Telefons nicht mehr richtig, bis Sie es aus- und wieder einschalten."</string>
     <string name="language_settings" msgid="502219872342167227">"Sprache &amp; Tastatur"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Einstellungen für Sprache &amp; Tastatur"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Spracheinstellungen"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Tastatureinstellungen"</string>
     <string name="phone_language" msgid="1165758957501090679">"Sprache auswählen"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Autom. Ersetzung"</string>
@@ -870,15 +929,15 @@
     <string name="show_password" msgid="2198798062604049206">"Sichtbare Passwörter"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Passwort bei der Eingabe anzeigen"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Diese Eingabemethode kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der Anwendung <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Möchten diese Eingabemethode verwenden?"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Wörterbuch des Nutzers"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Wörterbuch des Nutzers"</string>
+    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Mein Wörterbuch"</string>
+    <string name="user_dict_settings_title" msgid="8357027437499042191">"Mein Wörterbuch"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Hinzufügen"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ins Wörterbuch"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Wort bearbeiten"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Bearbeiten"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Löschen"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Sie haben keine Wörter im Nutzerwörterbuch. Sie können über das Menü ein Wort hinzufügen."</string>
+    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Keine Wörter im Ihrem Wörterbuch vorhanden. Sie können über das Menü ein Wort hinzufügen."</string>
     <string name="testing" msgid="6584352735303604146">"Test"</string>
     <string name="testing_phone_info" msgid="8656693364332840056">"Telefoninformation"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Akkuinformationen"</string>
@@ -897,13 +956,17 @@
     <string name="input_method" msgid="5434026103176856164">"Eingabemethode"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Optionen für Texteingabe verwalten"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-Einstellungen"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Einstellungen der Bildschirmtastatur"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Tastatur des Geräts"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Einstellungen für eingebaute Tastatur"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Eingebaute Tastatur"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Einstellungen für eingebaute, physische Tastatur"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Entwicklung"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Optionen zur Anwendungsentwicklung festlegen"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-Debugging"</string>
-    <string name="enable_adb_summary" msgid="4881186971746056635">"Debugmodus bei Anschluss eines USB-Geräts"</string>
+    <string name="enable_adb_summary" msgid="4881186971746056635">"Debugmodus bei Anschluss über USB"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Aktiv lassen"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Falsche Standorte"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"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" msgid="8930591383312775132">"Eingabehilfe deaktivieren?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Keine Eingabehilfen-Anwendungen gefunden"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Es sind keine Eingabehilfen-Anwendungen installiert."\n\n"Sie können von Android Market einen Screenreader für Ihr Gerät herunterladen."\n\n"Klicken Sie auf \"OK\", um den Screenreader zu installieren."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Skripts für Eingabehilfen"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Skripts für Eingabehilfen herunterladen"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Anwendungen dürfen Eingabehilfenskripts von Google herunterladen."</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Einige Anwendungen können Google auffordern, Skripts auf Ihr Telefon herunterzuladen, um den Zugriff auf deren Content zu erleichtern. Sind Sie sicher, dass Sie Google gestatten möchten, Skripts für Eingabehilfen auf Ihrem Telefon zu installieren?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Ein-/Austaste"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Ein/Aus beendet Anruf"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Das Drücken der Ein-/Austaste während eines Anrufs beendet den Anruf (statt den Bildschirm auszuschalten)"</string>
@@ -948,19 +1006,19 @@
     <string name="power_usage_summary" msgid="7237084831082848168">"Was zum Akkuverbrauch beiträgt"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkuverbrauch seit dem Ausstecken"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akkuverbrauch seit dem Zurücksetzen"</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> auf Akku"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> mit Akku"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> seit dem Ausstecken"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Wird geladen"</string>
-    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Bildschirm aktiviert"</string>
-    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aktiviert"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"WLAN"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Bildschirm an"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aktiv"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"WLAN"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefonsignal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Aktivzeit des Geräts"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"WLAN-Aktivzeit"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"WLAN-Aktivzeit"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"WLAN-Aktivzeit"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"WLAN-Aktivzeit"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Akkuverbrauch - Details"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Details"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU Vordergrund"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Aktiv lassen"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"WLAN aktiv"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Gesendete Daten"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Empfangene Daten"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Anwendungsinfo"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Anwendungseinstellungen"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Display-Einstellungen"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"WLAN-Einstellungen"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"WLAN-Einstellungen"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-Einstellungen"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Akkuverbrauch durch Anrufe"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Akkuverbrauch bei inaktivem Telefon"</string>
@@ -1061,11 +1118,11 @@
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aktualisieren der Bluetooth-Einstellung"</string>
     <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-Einstellungen"</string>
     <string name="vpn_connect_to" msgid="2541409082892684362">"Mit <xliff:g id="NAME">%s</xliff:g> verbinden"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Nutzername:"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Name:"</string>
     <string name="vpn_password_colon" msgid="5716278710848606626">"Passwort:"</string>
     <string name="vpn_a_username" msgid="6664733641993968692">"ein Nutzername"</string>
     <string name="vpn_a_password" msgid="1537213632501483753">"ein Passwort"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Nutzername speichern"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Name speichern"</string>
     <string name="vpn_connect_button" msgid="1699007212602470655">"Verbinden"</string>
     <string name="vpn_yes_button" msgid="8034531001149843119">"Ja"</string>
     <string name="vpn_no_button" msgid="7620339571187119107">"Nein"</string>
@@ -1143,8 +1200,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Anwendungen können sichere Zertifikate &amp;amp; Anmeldeinform. abrufen"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Passwort eingeben"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Geben Sie das Passwort für den Anmeldeinformationsspeicher ein."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Von SD-Karte installieren"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Verschlüsselte Zertifikate von SD-Karte installieren"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Von USB-Speicher inst."</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Von SD-Karte installieren"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Verschl. Zertifikate von USB-Speicher inst."</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Verschlüsselte Zertifikate von SD-Karte installieren"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Passwort festlegen"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Passwort für Anmeldeinformationsspeicher festlegen oder ändern"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Speicherinhalt löschen"</string>
@@ -1181,11 +1240,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Sicherung und Wiederherstellung"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Persönliche Daten"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Meine Daten sichern"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Meine Einstellungen und andere Anwendungsdaten sichern"</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Anwendungsdaten, WLAN-Passwörter und andere Einstellungen auf Google-Servern sichern"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Autom. Wiederherst."</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Einstellungen oder andere Daten wiederherstellen, wenn ich eine Anwendung neu installiere"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Gesicherte Einstellungen oder andere Daten wiederherstellen, wenn ich eine Anwendung neu installiere"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sicherung"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Möchten Sie wirklich die Sicherung Ihrer Einstellungen beenden und alle Kopien auf den Google-Servern löschen?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Möchten Sie wirklich die Sicherung Ihrer WLAN-Passwörter, Lesezeichen und anderen Einstellungen und Anwendungsdaten beenden und alle Kopien auf den Google-Servern löschen?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Einstellungen für die Geräteverwaltung"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Geräteadministrator"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktivieren"</string>
@@ -1207,35 +1266,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Liste aktualisieren"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Überspringen"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Weiter"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Netzwerke werden überprüft..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Zur Netzwerkauswahl berühren"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Mit vorhandenem Netzwerk verbinden"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Netzwerkkonfiguration eingeben"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Mit neuem Netzwerk verbinden"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Verbindung wird hergestellt..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Verbunden"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Weiter zum nächsten Schritt"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Bei der Synchronisierung treten derzeit Probleme auf. Sie wird in Kürze fortgesetzt."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Konto hinzufügen"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Allg. Synchron.-Einstellungen"</string>
+    <string name="background_data" msgid="5779592891375473817">"Hintergrunddaten"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Daten können synchronisiert, gesendet und empfangen werden."</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Achtung"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Durch die Hintergrunddaten-Deaktivierung kann die Akkulaufzeit verlängert und die Verwendung von Daten verringert werden. Einige Anwendungen nutzen die Hintergrunddatenverbindung eventuell weiterhin."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Autom. synchronisieren"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Anwendungen synchronisieren Daten automatisch."</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Konten verwalten"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synchronisierung an"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchronisierung aus"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Synchron.fehler"</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index ea472a7..6d5e026 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Στατικό"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Απενεργοποιημένο"</item>
     <item msgid="3165868966179561687">"Προειδοποίηση"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6e1594d..88c7308 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"αρχ."</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Αφαίρεση κάρτας SD"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Διαμόρφωση κάρτας SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Αποπροσ. αποθ. χώρου USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Αφαίρεση κάρτας SD"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Διαγρ. αποθ. χώρου USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Διαγραφή κάρτας SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Μικρό"</string>
     <string name="medium_font" msgid="2068475425515133701">"Μέτριο"</string>
     <string name="large_font" msgid="599055175160971446">"Μεγάλο"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"Κάρτα SD"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Αποθ. χώρος USB"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Κάρτα SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Κατάσταση μπαταρίας:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Τροφοδοσία ρεύματος:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Κλίμακα μπαταρίας:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Νεκρό"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Υπερβολική τάση"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Άγνωστο σφάλμα"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Ανιχνεύσιμο"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Ανιχνεύσιμο για <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> δευτερόλεπτα..."</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Εκκίνηση <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Λογαριασμός:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Ρυθμίσεις διακομιστή μεσολάβησης"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Ορίστε το γενικό διακομιστή μεσολάβησης HTTP και τις λίστες εξαιρέσεων"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Εκκαθάριση"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Θύρα"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Δεν υπάρχει διακομιστής μεσολάβησης για"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Επαναφορά προεπιλογών"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Ολοκληρώθηκε"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Όνομα κεντρικού υπολογιστή"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Προσοχή"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Το όνομα κεντρικού υπολογιστή που πληκτρολογήσατε δεν είναι έγκυρο."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Η λίστα εξαιρέσεων που έχετε πληκτρολογήσει δεν έχει μορφοποιηθεί σωστά. Πληκτρολογήστε τους τομείς που θέλετε να εξαιρεθούν, χωρίζοντάς τους με κόμμα."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Πρέπει να συμπληρώσετε το πεδίο θύρας."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Το πεδίο θύρας θα πρέπει να είναι κενό αν το πεδίο κεντρικού υπολογιστή είναι κενό."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Η θύρα που πληκτρολογήσατε δεν είναι έγκυρη."</string>
@@ -187,18 +187,23 @@
     <string name="band_mode_failed" msgid="1495968863884716379">"Ανεπιτυχής"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Επιτυχής"</string>
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Οι αλλαγές θα πραγματοποιηθούν όταν πραγματοποιηθεί επανασύνδεση του καλωδίου USB"</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Ενεργοποίηση μέσου μαζικής αποθήκευσης USB"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Ενεργοποίηση χώρου μαζικής αποθήκευσης USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Συνολικός αριθμός byte:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Δεν υπάρχει κάρτα SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Μη προσαρτ. αποθηκ. χώρος USB"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Δεν υπάρχει κάρτα SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Διαθέσιμος αριθμός bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"Η κάρτα SD χρησιμοποιείται ως συσκευή μαζικής αποθήκευσης"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"Μπορείτε να αφαιρέσετε την κάρτα SD με ασφάλεια"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"Η κάρτα SD αφαιρέθηκε ενώ βρισκόταν σε χρήση!"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Χρ. απ. χώρ. USB για μαζ. απ."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Η κάρτα SD χρησιμοποιείται ως συσκευή μαζικής αποθήκευσης"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Κατάργ. αποθ. χώρ. USB με ασφ."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Μπορείτε να αφαιρέσετε την κάρτα SD με ασφάλεια"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Κατάργ. απ. χώρ. USB σε χρήση!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Η κάρτα SD αφαιρέθηκε ενώ βρισκόταν σε χρήση!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Αριθμός bytes που χρησιμοποιήθηκαν:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Σάρωση κάρτας SD για πολυμέσα..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"Η κάρτα SD που προσαρτήθηκε είναι μόνο για ανάγνωση"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Σάρ. αποθ. χώρ. USB για πολυμ."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Σάρωση κάρτας SD για πολυμέσα..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Προσ. αποθ. χώρ. USB για ανάγ."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Η κάρτα SD που προσαρτήθηκε είναι μόνο για ανάγνωση"</string>
+    <string name="skip_label" msgid="47510779345218297">"Παράλ"</string>
     <string name="next_label" msgid="4693520878012668114">"Επόμενο"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Γλώσσα"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Επιλογή δραστηριότητας"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Πληροφορίες μπαταρίας"</string>
     <string name="display_label" msgid="7403874003169865762">"Προβολή"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Πληροφορίες τηλεφώνου"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"Κάρτα SD"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Αποθ. χώρος USB"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Κάρτα SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Ρυθμίσεις διακομιστή μεσολάβησης"</string>
     <string name="cancel" msgid="6859253417269739139">"Ακύρωση"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ρυθμίσεις"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Ρυθμίσεις"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Ρυθμίσεις"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Λειτουργία πτήσης"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Απενεργοποίηση όλων των ασύρματων συνδέσεων"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Επιλέξτε εταιρεία δικτύου"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Ημερομηνία &amp; ώρα"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Ορισμός ημερομηνίας, ώρας, ζώνης ώρας &amp; μορφές"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Αυτόματη ημερομ. και ώρα"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Χρήση ώρας που παρέχεται από το δίκτυο"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Χρήση ώρας που παρέχεται από το δίκτυο"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Αυτόματη ζώνη ώρας"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Χρήση ζώνης ώρας που παρέχεται από το δίκτυο"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Χρήση ζώνης ώρας που παρέχεται από το δίκτυο"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Χρήση μορφής 24ώρου"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Ορισμός ώρας"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Επιλογή ζώνης ώρας"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ταξινόμηση με βάση ζώνη ώρας"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Κλείδωμα συσκευής μετά τη λήξη του ορίου χρόνου"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Προσαρμογή της καθυστέρησης πριν το αυτόματο κλείδωμα της συσκευής"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Τοποθεσία και ασφάλεια"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Ρυθμίσεις τοποθεσίας και ασφάλειας"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ΟΚ"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Ακύρωση"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Διαχείριση συσκευής"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Επιλογή διαχειριστών συσκευών"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Προσθήκη ή κατάργηση διαχειριστών συσκευών"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Επιλογή διαχειριστών συσκευών"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Προσθήκη ή κατάργηση διαχειριστών συσκευών"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ενεργοποίηση Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Ρυθμίσεις Bluetooth"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ως τηλέφωνο ανοιχτής συνομιλίας"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Για μουσική και πολυμέσα"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Διατήρηση ρυθμίσεων"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Κάντε χρήση της Επικοινωνίας κοντινού πεδίου για την ανάγνωση και ανταλλαγή ετικετών"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Ενεργοποίηση Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Ρυθμίσεις Wi-Fi"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Σύνδεση στο δίκτυο"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Διαγραφή δικτύου από τη μνήμη"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Τροποποίηση δικτύου"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Ρύθμιση δικτύου"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Εισαγωγή ορισμού από σημείο πρόσβασης"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"Δίκτυο SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Ασφάλεια"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Ταυτότητα"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Ανώνυμη ταυτότητα"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Κωδικός πρόσβασης"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Εμφάνιση κωδικού πρόσβασης"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Ρυθμίσεις IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(δεν έγινε αλλαγή)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(δεν έχει καθοριστεί)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Δίκτυο που έχει διατηρηθεί"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Απενεργοποιημένο"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Εκτός εμβέλειας"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Ασφαλισμένο με <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Ασφαλισμένο με <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Ασφαλισμένο με <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (διαθέσιμο WPS)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, ασφαλισμένο με <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Σύνδεση"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Να διαγραφεί από τη μνήμη"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Ρυθμίσεις IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Αποθ/ση"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Ακύρωση"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Πληκτρολογήστε μια έγκυρη διεύθυνση IP."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Πύλη"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Μάσκα δικτύου"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Φορητό σημείο πρόσβασης Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Το φορητό σημείο πρόσβασης <xliff:g id="NETWORK_SSID">%1$s</xliff:g> είναι ενεργό"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Σφάλμα φορητού σημείου πρόσβασης Wi-Fi"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Κατάσταση"</string>
     <string name="device_status" msgid="607405385799807324">"Κατάσταση"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Τηλεφωνικός αριθμός, σήμα κ.λπ."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Αφαίρεση κάρτας SD, προβολή διαθέσιμου αποθηκευτικού χώρου"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Κοινόχρ. και ασφαλ. αποθ."</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Αποθηκευτικός χώρος"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Ρυθμίσεις αποθηκευτικού χώρου"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Αποπροσάρτηση αποθηκευτικού χώρου USB, προβολή διαθέσιμου αποθηκευτικού χώρου"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Αφαίρεση κάρτας SD, προβολή διαθέσιμου αποθηκευτικού χώρου"</string>
     <string name="status_number" msgid="5123197324870153205">"Ο τηλεφωνικός αριθμός μου"</string>
     <string name="status_min_number" msgid="3519504522179420597">"ΛΕΠΤΟ"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Έκδοση PRL"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Μη διαθέσιμο"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Χρόνος από την τελευταία εκκίνηση"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Χρόνος αφύπνισης"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Εσωτερικός αποθηκευτικός χώρος τηλεφώνου"</string>
-    <string name="sd_memory" msgid="151871913888051515">"Κάρτα SD"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Εσωτερικός αποθηκευτικός χώρος"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Αποθ. χώρος USB"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Κάρτα SD"</string>
     <string name="memory_available" msgid="418542433817289474">"Διαθέσιμος χώρος"</string>
     <string name="memory_size" msgid="6629067715017232195">"Συνολικός χώρος"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Αφαίρεση κάρτας SD"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Αποπροσαρτήστε την κάρτα SD για ασφαλή αφαίρεση"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Αποπρ. κοιν. αποθ. χώρου"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Αφαίρεση κάρτας SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Αποπροσ. εσωτ. χώρο αποθ. USB"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Αποπροσαρτήστε την κάρτα SD για να την αφαιρέσετε με ασφάλεια"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Ενεργοποίηση λειτουργίας PTP"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Εμφάνιση σε USB ως συσκευή κάμερας PTP αντί για συσκευή MTP"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Εισαγάγετε μια κάρτα SD για τοποθέτηση"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Τοποθέτηση κάρτας SD"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Τοποθέτηση κάρτας SD"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Διαμόρφωση κάρτας SD"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Διαμόρφωση (διαγραφή) της κάρτας SD"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Εισ. απ. χώρ. USB για προσ."</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Εισαγάγετε μια κάρτα SD για τοποθέτηση"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Προσάρτ. κοιν. αποθ. χώρ."</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Τοποθέτηση κάρτας SD"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Προσαρ. τον εσ. αποθ. χώρο USB"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Τοποθέτηση κάρτας SD"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Διαγρ. αποθ. χώρου USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Διαγραφή κάρτας SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Διαγρ. δεδ. εσωτ. απ. χώρ. USB"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Διαγράφει όλα τα δεδομένα που υπάρχουν στην κάρτα SD του τηλεφώνου σας, όπως αρχεία μουσικής και φωτογραφίες"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Μη διαθέσιμο"</string>
     <string name="read_only" msgid="6702420168629076340">" (Μόνο για ανάγνωση)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Αφαίρεση κάρτας SD"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Εάν αφαιρέσετε την κάρτα SD, ορισμένες από τις εφαρμογές που χρησιμοποιείτε θα σταματήσουν και ενδέχεται να μην είναι διαθέσιμες μέχρι να την τοποθετήσετε ξανά."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Η αφαίρεση της κάρτας SD απέτυχε"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Δεν είναι δυνατή η αφαίρεση της κάρτας SD. Προσπαθήστε ξανά αργότερα."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"Η κάρτα SD θα αφαιρεθεί. Ελέγξτε την περιοχή ειδοποιήσεων για πληροφορίες κατάστασης."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Αποπροσ. αποθ. χώρου USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Αφαίρεση κάρτας SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Εάν αποπροσαρτήσετε τον αποθηκευτικό χώρο USB, ορισμένες από τις εφαρμογές που χρησιμοποιείτε θα σταματήσουν και ενδέχεται να μην είναι διαθέσιμες μέχρι να τον τοποθετήσετε ξανά."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Εάν αφαιρέσετε την κάρτα SD, ορισμένες από τις εφαρμογές που χρησιμοποιείτε θα σταματήσουν και ενδέχεται να μην είναι διαθέσιμες μέχρι να την τοποθετήσετε ξανά."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Αποτ. αποπροσ. αποθ. χώρου USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Η αφαίρεση της κάρτας SD απέτυχε"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Αδυναμία αποπροσάρτησης αποθηκευτικού χώρου USB. Δοκιμάστε ξανά αργότερα."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Δεν είναι δυνατή η αφαίρεση της κάρτας SD. Προσπαθήστε ξανά αργότερα."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Θα γίνει αποπροσάρτηση του αποθηκευτικού χώρου USB."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Θα γίνει αποπροσάρτηση της κάρτας SD."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Αφαίρεση"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Αφαίρεση σε εξέλιξη"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Κατάσταση μπαταρίας"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Η επαναφορά των εργοστασιακών ρυθμίσεων APN ολοκληρώθηκε"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Επαναφορά εργοστασιακών δεδομένων"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Διαγραφή όλων των δεδομένων στο τηλέφωνο"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Αυτή η ενέργεια θα διαγράψει όλα τα δεδομένα από το τηλέφωνό σας, συμπεριλαμβανομένων:"\n<li>"του Λογαριασμού Google"</li>\n<li>"των δεδομένων και εφαρμογών συστήματος και εφαρμογών"</li>\n<li>"των εφαρμογών από λήψη"</li>\n"Δεν θα διαγράψει:"\n<li>"το τρέχον λογισμικό και τις ομαδοποιημένες εφαρμογές συστήματος"</li>\n<li>"τα αρχεία κάρτας SD, όπως μουσική ή φωτογραφίες"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" του τηλεφώνου σας, συμπεριλαμβανομένων:"\n\n<li>"Του Λογαριασμού σας Google"</li>\n<li>"Των ρυθμίσεων και των δεδομένων συστήματος και εφαρμογής"</li>\n<li>"Των εφαρμογών που έχουν ληφθεί"</li>\n\n"Για να γίνει εκκαθάριση όλων των δεδομένων αυτού του τηλεφώνου, θα πρέπει να γίνει διαγραφή του "<b>"αποθηκευτικού χώρου USB"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Θα διαγραφούν όλα τα δεδομένα σας από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>", συμπεριλαμβανομένων:"\n\n<li>"Του Λογαριασμού σας Google"</li>\n<li>"Των ρυθμίσεων και των δεδομένων συστήματος και εφαρμογής"</li>\n<li>"Των εφαρμογών που έχουν ληφθεί"</li>\n\n"Η "<b>"κάρτα SD"</b>" πρέπει, επίσης, να διαγραφεί για την εκκαθάριση των αρχείων μουσικής, των εικόνων και άλλων δεδομένων του χρήστη."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Διαγρ. αποθ. χώρου USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Διαγραφή κάρτας SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στον εσωτερικό αποθηκευτικό χώρο του τηλεφώνου σας, όπως αρχεία μουσικής και φωτογραφίες."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στην κάρτα SD του τηλεφώνου σας, όπως αρχεία μουσικής και φωτογραφίες."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Επαναφορά τηλεφώνου"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Να πραγματοποιηθεί διαγραφή όλων των προσωπικών στοιχείων και τυχόν εφαρμογών από λήψη; Αυτή η ενέργεια δεν είναι αναστρέψιμη!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Διαγραφή όλων"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για επιβεβαίωση επαναφοράς τηλεφώνου."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Δεν πραγματοποιήθηκε επαναφορά επειδή η υπηρεσία Εκκαθάρισης συστήματος δεν είναι διαθέσιμη."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Διαμόρφωση κάρτας SD."</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Διαγραφή όλων των δεδομένων στην κάρτα SD"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Αυτή η ενέργεια θα διαγράψει την κάρτα SD στο τηλέφωνο. Θα χάσετε όλα τα δεδομένα στην κάρτα!"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"Διαμόρφωση κάρτας SD"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Να γίνει διαμόρφωση της κάρτας SD, η οποία θα διαγράψει όλα τα πολυμέσα σας; Η ενέργεια είναι μη αναστρέψιμη!"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Διαγρ. αποθ. χώρου USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Διαγραφή κάρτας SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Διαγρ. δεδομ. αποθ. χώρου USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Διαγραφή όλων των δεδομένων στην κάρτα SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Με αυτή την ενέργεια ο χώρος αποθήκευσης USB θα διαγραφεί. Θα χάσετε "<b>"όλα"</b>" τα δεδομένα που έχετε αποθηκεύσει εκεί!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Αυτή η ενέργεια θα διαγράψει την κάρτα SD. Θα χάσετε "<b>"όλα"</b>" τα δεδομένα που έχετε στην κάρτα!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Διαγρ. αποθ. χώρου USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Διαγραφή κάρτας SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Να γίνει διαγραφή του αποθηκευτικού χώρου USB, η οποία θα διαγράψει όλα τα αρχεία που έχετε αποθηκεύσει εκεί; Η ενέργεια είναι μη αναστρέψιμη!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Να γίνει διαγραφή της κάρτας SD, με την οποία θα διαγραφούν όλα τα αρχεία που έχετε αποθηκεύσει εκεί; Η ενέργεια είναι μη αναστρέψιμη!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Διαγραφή όλων"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για επιβεβαίωση διαμόρφωσης μιας κάρτας SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να κάνετε διαγραφή του αποθηκευτικού χώρου USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να κάνετε διαγραφή της κάρτας SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ρυθμίσεις κλήσης"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ορισμ.αυτόμ.τηλεφ., προώθ.κλήσης, αναμ.κλήσης, αναγν.κλήσ."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB tethering"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Σφάλμα Bluetooth tethering"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Δεν γίνεται σύνδ. σε περισσότερες από <xliff:g id="MAXCONNECTION">%1$d</xliff:g> συσκευές"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Ρυθμίσεις Bluetooth tethering"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Επιλέξτε συσκευές Bluetooth για σύνδεση"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Βοήθεια"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Δίκτυα κινητής τηλεφωνίας"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Ορισμός επιλογών για περιαγωγή, δίκτυα, APN"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Χρήση υποβοηθούμενου GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Χρήση διακομιστή για βοήθεια GPS (αποεπιλογή για να μειώσετε τη χρήση του δικτύου)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Χρήση διακομιστή για βοήθεια του GPS (αποεπιλογή για βελτίωση της απόδοσης του GPS)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Χρήση της τοποθεσίας μου"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Σχετικά με το τηλέφωνο"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Προβ.νομ.πληροφ., κατάστ.τηλεφ., έκδ.λογισμ."</string>
     <string name="legal_information" msgid="5769301644270604095">"Νομικές πληροφορίες"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Άγνωστο"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ταξινόμηση κατά όνομα"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ταξινόμηση με βάση μέγεθος"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Εμφ. υπ. που εκτελούνται"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Εμφ. διαδ. προσωρ. μνήμης"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Διαχείριση χώρου"</string>
     <string name="filter" msgid="2018011724373033887">"Φίλτρο"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Επιλογές φίλτρου"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Όλα"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Η λήψη ολοκληρώθηκε"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Εκτελείται"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"Στην κάρτα SD"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Αποθ. χώρος USB"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Στην κάρτα SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Απενεργοποιημένο"</string>
     <string name="no_applications" msgid="5190227407135243904">"Δεν υπάρχουν εφαρμογές."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Εσ. αποθ. χώρος"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Αποθ. χώρος USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Κάρ. χώρ. απ. SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Εκ νέου υπολογισμός μεγέθους..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Διαγραφή"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Όλα τα δεδομένα της εφαρμογής θα διαγραφούν μόνιμα. Αυτό περιλαμβάνει όλα τα αρχεία, τις ρυθμίσεις, τους λογαριασμούς, τις βάσεις δεδομένων και τα λοιπά."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"έκδοση <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Μετακίνηση"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Μετακίνηση στο τηλέφωνο"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Μετακίνηση στην κάρτα SD"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Μετακ. σε αποθ. χώρο USB"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Μετακίνηση στην κάρτα SD"</string>
     <string name="moving" msgid="6431016143218876491">"Μετακίνηση"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Ο διαθέσιμος χώρος αποθήκευσης δεν επαρκεί."</string>
     <string name="does_not_exist" msgid="837163572898468245">"Η εφαρμογή δεν υπάρχει."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Προτιμώμενη θέση εγκατάστασης"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Αλλαγή της προτιμώμενης θέσης εγκατάστασης για νέες εφαρμογές."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Αποθηκευτικός χώρος"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Προβολή του χώρου αποθήκευσης που χρησιμοποιούν οι εφαρμογές"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Υπηρεσίες που εκτελούνται"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Προβολή και έλεγχος των εφαρμογών που εκτελούνται αυτή τη στιγμή"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Γίνεται επανεκκίνηση"</string>
+    <string name="cached" msgid="1059590879740175019">"Διαδικασία προσωρινά αποθηκευμένου φόντου"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Τίποτα σε εξέλιξη."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Έναρξη από την εφαρμογή."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> διαθέσιμη"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> σε χρήση"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> δωρ."</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> μετ."</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> διεργασία και <xliff:g id="NUMSERVICES">%2$d</xliff:g> υπηρεσία"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Ρυθμίσεις"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Αυτή η υπηρεσία εκκινήθηκε από αυτή την εφαρμογή. Η διακοπή της μπορεί να προκαλέσει αποτυχία της εφαρμογής."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Αυτή η εφαρμογή δεν μπορεί να διακοπεί με ασφάλεια. Αν το κάνετε, μπορεί να χάσετε την τρέχουσα εργασία σας."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Πρόκειται για μια παλιά διαδικασία εφαρμογής η οποία διατηρείται για καλύτερη ταχύτητα σε περίπτωση που χρειαστεί ξανά. Συνήθως δεν υπάρχει λόγος διακοπής της."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: χρησιμοποιείται. Πατήστε την επιλογή \"Ρυθμίσεις\" για έλεγχο."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Κύρια διεργασία σε χρήση."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Η υπηρεσία <xliff:g id="COMP_NAME">%1$s</xliff:g> χρησιμοποιείται."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Ο πάροχος <xliff:g id="COMP_NAME">%1$s</xliff:g> χρησιμοποιείται."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Διακοπή υπηρεσίας συστήματος;"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Είστε ακόμα σίγουροι ότι θέλετε να διακόψετε αυτή την υπηρεσία συστήματος; Αν ναι, κάποιες λειτουργίες του τηλεφώνου σας ενδέχεται να σταματήσουν να λειτουργούν σωστά μέχρι να απενεργοποιήσετε και να ενεργοποιήσετε ξανά την υπηρεσία."</string>
     <string name="language_settings" msgid="502219872342167227">"Γλώσσα και πληκτρολόγιο"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ρυθμίσεις γλώσσας και πληκτρολογίου"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Ρυθμίσεις γλώσσας"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Ρυθμίσεις πληκτρολογίου"</string>
     <string name="phone_language" msgid="1165758957501090679">"Επιλογή γλώσσας"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Αυτόματη αντικατάσταση"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Μέθοδος εισόδου"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Διαχείριση επιλογών εισόδου κειμένου"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Ρυθμίσεις <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ρυθμίσεις πληκτρολογίου οθόνης"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Πληκτρολόγιο συσκευής"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Ενσωματωμένες ρυθμίσεις πληκτρολογίου"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Ενσωματωμένο πληκτρολόγιο"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Ρυθμίσεις ενσωματωμένου κανονικού πληκτρολογίου"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Ανάπτυξη"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Ορισμός επιλογών για ανάπτυξη εφαρμογής"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Εντοπισμός σφαλμάτων USB"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Αυτή η υπηρεσία προσβασιμότητας ενδέχεται να έχει τη δυνατότητα συλλογής όλων των κειμένων που πληκτρολογείτε, συμπεριλαμβανομένων των προσωπικών δεδομένων και των αριθμών πιστωτικών καρτών εκτός των κωδικών πρόσβασης. Ενδέχεται επίσης να καταγράφει τις δραστηριότητες της επιφάνειας χρήστη. Αυτή η λειτουργία προέρχεται από την εφαρμογή <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Να χρησιμοποιηθεί αυτή η υπηρεσία προσβασιμότητας;"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Να απενεργοποιηθεί η προσβασιμότητα;"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Δεν βρέθηκαν εφαρμογές που σχετίζονται με δυνατότητα πρόσβασης"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Δεν έχετε εγκαταστήσει καμία εφαρμογή που σχετίζεται με την προσβασιμότητα."\n\n"Μπορείτε να κάνετε λήψη ενός προγράμματος ανάγνωσης οθόνης για τη συσκευή σας από το Android Market."\n\n"Κάντε κλικ στην επιλογή \"OK\" για να εγκαταστήσετε το πρόγραμμα ανάγνωσης οθόνης."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Σενάρια προσβασιμότητας"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Λήψη σεναρίων προσβασιμότητας"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Να επιτρ. στις εφ/γές η λήψη σεναρίων προσβ/τας από την Google"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Ορισμένες εφαρμογές ενδέχεται να ζητήσουν από την Google τη λήψη σεναρίων στο τηλέφωνό σας, τα οποία κάνουν το περιεχόμενό τους πιο προσβάσιμο. Θέλετε σίγουρα να επιτρέψετε στην Google να εγκαθιστά σενάρια προσβασιμότητας στο τηλέφωνό σας;"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Κουμπί λειτουργίας"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Το κουμπί λειτουργίας τερματίζει τις κλήσεις"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Κατά τη διάρκεια μιας κλήσης, το πάτημα του κουμπιού λειτουργίας τερματίζει τις κλήσεις αντί να απενεργοποιεί την οθόνη"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Φόρτιση"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Οθόνη ενεργοποιημένη"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ενεργοποιημένο"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"WIFI"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Κανον. λειτ."</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Σήμα τηλεφώνου"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Χρόνος ενεργοποίησης της συσκευής"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"Ώρα ενεργοποίησης WiFi"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"Ώρα ενεργοποίησης WiFi"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi στην ώρα του"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi στην ώρα του"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Λεπτομέρειες από τη χρήση της μπαταρίας"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Λεπτομέρειες χρήσης"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Προσκήνιο CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Διατήρηση λειτουρ."</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Το Wi-Fi είναι ενεργοποιημένο"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Τηλέφωνο"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Τα δεδομένα εστάλησαν"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Τα δεδομένα ελήφθησαν"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Πληροφορίες εφαρμογής"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Ρυθμίσεις εφαρμογών"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Ρυθμίσεις προβολής"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Ρυθμίσεις WiFi"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Ρυθμίσεις Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Ρυθμίσεις Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Μπαταρία που χρησιμοποιείται από φωνητικές κλήσεις"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Χρήση μπαταρίας όταν το τηλέφωνο είναι αδρανές"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Να επιτρέπεται στις εφαρμογές η πρόσβαση σε ασφαλή πιστοποιητικά και άλλα διαπιστευτήρια"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Εισαγωγή κωδικού πρόσβασης"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Εισαγάγετε τον κωδικό πρόσβασης του χώρου αποθήκευσης διαπιστευτηρίων."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Εγκατάσταση από κάρτα SD"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Εγκατάσταση κρυπτογραφημένων πιστοποιητικών από την κάρτα SD"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Εγκ. από αποθ. χώρο USB"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Εγκατάσταση από κάρτα SD"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Εγκ. κρ. πιστ. απ. χώρο USB"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Εγκατάσταση κρυπτογραφημένων πιστοποιητικών από την κάρτα SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Ορισμός κωδικού πρόσβασης"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Ορισμός ή αλλαγή κωδικού πρόσβασης χώρου αποθήκευσης διαπιστευτηρίων"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Εκκαθάριση χώρου αποθήκευσης"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Δημιουργία αντιγράφου ασφαλείας και επαναφορά"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Προσωπικά δεδομένα"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Δημιουργία αντιγράφων ασφαλείας για τα δεδομένα μου"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Δημιουργία αντιγράφων ασφαλείας για τις ρυθμίσεις και τα δεδομένα εφαρμογών."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Δεδομένα εφαρμογής δημιουργίας αντιγράφων ασφαλείας, κωδικοί πρόσβασης Wi-Fi και άλλες ρυθμίσεις στους διακομιστές Google"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Αυτόματη επαναφορά"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Εάν εγκαταστήσω ξανά μια εφαρμογή, να γίνει επαναφορά των ρυθμίσεων ή άλλων δεδομένων για τα οποία έχουν δημιουργηθεί αντίγραφα ασφαλείας."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Εάν εγκαταστήσω ξανά μια εφαρμογή, να γίνει επαναφορά των ρυθμίσεων ή άλλων δεδομένων για τα οποία έχουν δημιουργηθεί αντίγραφα ασφαλείας"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Αντίγραφο ασφαλείας"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Είστε βέβαιοι ότι θέλετε να διακόψετε τη δημιουργία αντιγράφων ασφαλείας των ρυθμίσεων και των δεδομένων εφαρμογών σας και να διαγράψετε όλα τα αντίγραφα από τους διακομιστές της Google;"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Είστε βέβαιοι ότι θέλετε να διακόψετε τη δημιουργία αντιγράφων ασφαλείας των κωδικών Wi-Fi, των σελιδοδεικτών και άλλων ρυθμίσεων και των δεδομένων εφαρμογών και να διαγράψετε όλα τα αντίγραφα από τους διακομιστές της Google;"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ρυθμίσεις διαχείρισης συσκευής"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Διαχειριστής συσκευής"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Απενεργοποίηση"</string>
@@ -1206,37 +1265,26 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Ανανέωση λίστας"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Παράβλεψη"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Επόμενο"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Σάρωση δικτύων..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Αγγίξτε για να επιλέξετε δίκτυο"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Σύνδεση σε υπάρχον δίκτυο"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Εισαγάγετε διαμόρφωση δικτύου"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Σύνδεση σε νέο δίκτυο"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Σύνδεση..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Συνδεδεμένο"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Προχωρήστε στο επόμενο βήμα"</string>
     <!-- no translation found for sync_is_failing (1591561768344128377) -->
     <skip />
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Προσθήκη λογαριασμού"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Γενικές ρυθμίσεις συγχρονισμού"</string>
+    <string name="background_data" msgid="5779592891375473817">"Δεδομένα φόντου"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Οι εφ/γές μπορούν να κάνουν συγχρ., αποστ. και λήψη δεδομ."</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Προσοχή"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Η απενεργοποίηση δεδομένων παρασκηνίου αυξάνει το χρόνο ζωής της μπαταρίας και μειώνει τη χρήση δεδομένων. Ορισμένες εφαρμογές ενδέχεται να συνεχίσουν να χρησιμοποιούν τη σύνδεση δεδομένων παρασκηνίου."</string>
     <!-- no translation found for sync_automatically (7558810110682562376) -->
     <skip />
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Οι εφαρμογές συγχρονίζουν αυτόματα τα δεδομένα"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Διαχείριση λογαριασμών"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Συγχρ. είναι ενεργ."</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Ο συγχρονισμός είναι απενεργοποιημένος"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Σφάλμα συγχρονισμού"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 9f06ef3..35f1849 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -142,11 +142,15 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Estático"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Ninguno"</item>
+    <item msgid="6267482274276126058">"Estático"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Apagado"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 3ececc6..6ff48eb 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Desmontar la tarjeta SD"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Formatear tarjeta SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Desmontar almacenamiento USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desmontar la tarjeta SD"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Borrar almacenamiento USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Borrar la tarjeta SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Pequeño"</string>
     <string name="medium_font" msgid="2068475425515133701">"Mediano"</string>
     <string name="large_font" msgid="599055175160971446">"Grande"</string>
     <string name="font_size_save" msgid="3450855718056759095">"Aceptar"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"Tarjeta SD"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Almacenamiento USB"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Tarjeta SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Estado de batería:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Enchufe:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Escala de batería:"</string>
@@ -84,6 +87,7 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Muerto"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Voltaje excesivo"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconocido"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Frío"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Visible"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Visible durante <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos…"</string>
@@ -130,23 +134,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Inicio <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Cuenta:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Configuraciones de proxy"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Establece el proxy HTTP global y las listas de exclusión"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Borrar"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Puerto"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"No hay proxy para"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar configuraciones predeterminadas"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Finalizado"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Nombre del servidor"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atención"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Aceptar"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"El nombre del servidor que has escrito no es válido."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"La lista de exclusión que escribiste no está debidamente formateada. Ingresa una lista de los dominios excluidos separados por comas."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Debes completar el campo de puerto."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo del puerto debe estar vacío si el campo de servidor está vacío."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"El puerto que has escrito no es válido."</string>
@@ -189,16 +188,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Los cambios se aplican cuando se vuelve a conectar el cable USB"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Activar el espacio de almacenamiento masivo USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total de bytes:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"No hay tarjeta SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Almacenamiento USB no montado"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"No hay tarjeta SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bytes disponibles:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"La tarjeta SD se utiliza como dispositivo de almacenamiento masivo"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"Ahora es seguro extraer la tarjeta SD"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"¡Se ha extraído la tarjeta SD mientras se encontraba en uso!"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"El almacenamiento USB se utiliza como dispositivo de almacenamiento masivo"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"La tarjeta SD se utiliza como dispositivo de almacenamiento masivo"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Es seguro eliminar el almacenamiento USB"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Ahora es seguro extraer la tarjeta SD"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"¡El almacenamiento USB se extrajo mientras se encontraba en uso!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"¡Se ha extraído la tarjeta SD mientras se encontraba en uso!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes utilizados:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Explorando medios en la tarjeta SD..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"Tarjeta SD montada para sólo lectura"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Explorando almacenamiento USB para obtener medios..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Explorando medios en la tarjeta SD..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Almacenamiento USB montado para sólo lectura"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Tarjeta SD montada para sólo lectura"</string>
+    <string name="skip_label" msgid="47510779345218297">"Omitir"</string>
     <string name="next_label" msgid="4693520878012668114">"Siguiente"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Idioma"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Seleccionar actividad"</string>
@@ -206,10 +210,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Información de la batería"</string>
     <string name="display_label" msgid="7403874003169865762">"Mostrar"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Información del teléfono"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"Tarjeta SD"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Almacenamiento USB"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Tarjeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configuración de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configuración"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Config."</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Configurac."</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo de avión"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Desactivar todas las conexiones inalámbricas"</string>
@@ -229,18 +235,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleccionar un operador de red"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Establecer fecha, hora, zona horaria y formatos"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Fecha y hora automáticas"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar hora proporcionada por la red"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usar hora proporcionada por la red"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Zona horaria automática"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar zona horaria proporcionada por la red"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Usar formato de 24 h"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Establecer la hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar zona horaria"</string>
@@ -250,6 +250,8 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Bloquear el dispositivo después del tiempo de espera"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Ajustar el retraso antes de que el dispositivo se bloquee automáticamente"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar la información del propietario en el bloqueo de la pantalla"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Información del propietario"</string>
     <string name="security_settings_title" msgid="5168491784222013179">"Seguridad y ubicación"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Configuración de ubicación y seguridad"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de la credencial"</string>
@@ -316,8 +318,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administración del dispositivo"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Seleccionar los administradores del dispositivo"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Agregar o eliminar los administradores de dispositivo"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Seleccionar los administradores del dispositivo"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Agregar o eliminar los administradores de dispositivo"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Config. de Bluetooth"</string>
@@ -355,7 +357,7 @@
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Conectado al audio de medios"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Conectado al audio del teléfono"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Conectado al audio del teléfono y los medios"</string>
-    <string name="bluetooth_summary_connected_to_hid" msgid="8147499644396475561">"Conectado a dispositivo de entrada "</string>
+    <string name="bluetooth_summary_connected_to_hid" msgid="8147499644396475561">"Conectado a dispositivo de entrada"</string>
     <string name="bluetooth_summary_connected_to_pan" msgid="3157622705092537266">"Anclado a red"</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"opciones de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Conectar"</string>
@@ -365,7 +367,7 @@
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del teléfono"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado al servidor de transferencia de archivo"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No conectado al servidor de transferencia de archivo"</string>
-    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado a dispositivo de entrada "</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado a dispositivo de entrada"</string>
     <string name="bluetooth_pan_profile_summary_connected" msgid="7456487225516323485">"Anclado a red"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para el audio de medios"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para el audio del teléfono"</string>
@@ -376,6 +378,9 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y medios"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recordar la configuración"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Utilizar campo la Transmisión de datos en proximidad para leer e intercambiar etiquetas"</string>
+    <string name="nfc_toggle_error" msgid="2233172102497535522">"Se produjo un error."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Encender Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Configuración Wi-Fi"</string>
@@ -395,9 +400,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar a la red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Olvidar red"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar la red"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Configuración de red"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Ingresar pin de punto de acceso"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID de red"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
@@ -412,18 +419,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidad anónima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Contraseña"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contraseña"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Configuración de IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(sin cambios)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(sin especificar)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Recordado"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Desactivado"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera del alcance"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Asegurado con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Asegurado con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Protegido con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS disponible)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, asegurado con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
@@ -442,11 +448,14 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Configuración de IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Guardar"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancelar"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Escribe una dirección IP válida."</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Escribe una dirección IP válida."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Escribe una dirección válida de la puerta de enlace."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Escribe una dirección DNS válida."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Escribe una longitud de prefijo de la red de entre 0 y 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Acceso"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Máscara de red"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud de prefijo de la red"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona activa Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Zona activa portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> conectada"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error en la zona activa Wi-Fi portátil"</string>
@@ -504,7 +513,7 @@
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Configuración para la base adjunta del automóvil"</string>
     <string name="dock_audio_summary_none" msgid="289909253741048784">"El teléfono no se encuentra en la base"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configuración para la base adjunta"</string>
-    <string name="dock_not_found_title" msgid="3290961741828952424">"No se encontró la base "</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"No se encontró la base"</string>
     <string name="dock_not_found_text" msgid="3035260358985111855">"El teléfono debe estar en la base para configurar el audio de la base."</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Sonido al insertar acoplar"</string>
     <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Reproducir sonido cuando se inserte o elimine un teléfono desde acoplar."</string>
@@ -549,20 +558,20 @@
     <string name="device_info_settings" msgid="475872867864762157">"Estado del teléfono"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualiz. del sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Versión Androide"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Versión de Android"</string>
     <string name="model_number" msgid="3765737700545384794">"Número de modelo"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versión de banda de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versión núcleo"</string>
-    <string name="build_number" msgid="3075795840572241758">"Crear número"</string>
+    <string name="build_number" msgid="3075795840572241758">"Número de compilación"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Número de teléfono, señal, etc."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Desmontar tarjeta SD, ver espacio de almacenamiento disponible"</string>
+    <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Compartido y almacenaje seguro"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Espacio de almacenamiento"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Configuración de almacenamiento"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desmontar almacenamiento USB, ver almacenamiento disponible"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desmontar tarjeta SD, ver espacio de almacenamiento disponible"</string>
     <string name="status_number" msgid="5123197324870153205">"Mi número de teléfono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versión de PRL"</string>
@@ -578,26 +587,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Hora productiva"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Hora de actividad"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Espacio de almac. interno del tel."</string>
-    <string name="sd_memory" msgid="151871913888051515">"Tarjeta SD"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Almacenamiento interno"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Almacenamiento USB"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Tarjeta SD"</string>
     <string name="memory_available" msgid="418542433817289474">"Espacio disponible"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espacio total"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Desmontar la tarjeta SD"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Desmontar la tarjeta SD para extraerla de manera segura"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar alm. comp."</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar la tarjeta SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desmontar el almacenamiento USB interno"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desmonta la tarjeta SD para que puedas extraerla de forma segura"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Habilitar modo PTP"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Usar USB como un dispositivo de cámara PTP en lugar de un dispositivo MTP"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Insertar una tarjeta SD para el montaje"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Montar tarjeta SD"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Montar la tarjeta SD"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Formatear tarjeta SD"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Formato (borrar) la tarjeta SD"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Insertar almacenamiento USB para el montaje"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insertar una tarjeta SD para el montaje"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Activar el almacenamiento USB"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Montar tarjeta SD"</string>
+    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Activar el almacenamiento USB"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Montar la tarjeta SD"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Borrar almacenamiento USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Borrar la tarjeta SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Borra todos los datos del almacenamiento USB interno del teléfono, como la música y las fotos"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Borra todos los datos de la tarjeta SD del teléfono, como la música y las fotos"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"No disponible"</string>
     <string name="read_only" msgid="6702420168629076340">" (Sólo lectura)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Desmontar la tarjeta SD"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Si desmontas la tarjeta SD, algunas aplicaciones que estás usando se detendrán y es posible que no estén disponibles hasta que retires la tarjeta SD."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Error al desmontar la tarjeta SD"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"No se pudo desmontar la tarjeta SD. Vuelve a intentarlo más tarde."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"Se desmontará la tarjeta SD. Verifica el área de notificación para conocer el estado."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Desmontar almacenamiento USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Desmontar la tarjeta SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Si desmontas el almacenamiento USB, se detendrán algunas aplicaciones que utilices y es posible que no estén disponibles hasta que vuelvas a montar el almacenamiento USB."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Si desmontas la tarjeta SD, algunas aplicaciones que estás usando se detendrán y es posible que no estén disponibles hasta que retires la tarjeta SD."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"No se pudo desmontar el almacenamiento USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Error al desmontar la tarjeta SD"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"No se puede desactivar el almacenamiento USB. Vuelve a intentarlo más tarde."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"No se pudo desmontar la tarjeta SD. Vuelve a intentarlo más tarde."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"El almacenamiento USB se desmontará."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Se desactivará la tarjeta SD."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desmontando"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontaje en progreso"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de batería"</string>
@@ -637,21 +659,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Restablecimiento completado de configuración de APN predeterminada"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restabl. datos de fábrica"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Borra todos los datos del teléfono"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Todos los datos de tu teléfono serán eliminados, incluidos:"\n<li>"tu cuenta de Google"</li>\n<li>"la configuración y los datos de la aplicación y el sistema"</li>\n<li>"las aplicaciones descargadas"</li>\n"No se eliminarán:"\n<li>"el software del sistema actual y las aplicaciones en lote"</li>\n<li>"archivos de tarjeta SD, como por ejemplo, música o fotos"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Si lo haces, se borrarán todos los datos del "<b>"almacenamiento interno"</b>"de tu teléfono, incluida:"\n\n<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de la aplicación"</li>\n<li>"las aplicaciones descargadas"</li>\n\n"Si deseas borrar todos los datos de este teléfono, deberás borrar el "<b>"almacenamiento USB"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Si lo haces, se borrarán todos los datos del "<b>"almacenamiento interno"</b>"de tu teléfono, incluida:"\n\n<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de la aplicación"</li>\n<li>"las aplicaciones descargadas"</li>\n\n"Si también deseas borrar la música, las fotos y otros datos de usuario, deberás borrar la "<b>"tarjeta SD"</b>"."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Borrar almacenamiento USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Borrar la tarjeta SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Borrar todos los datos del almacenamiento USB del teléfono, como la música o las fotos."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Borra todos los datos de la tarjeta SD del teléfono, como la música o las fotos."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Restablecer el teléfono"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"¿Deseas borrar toda tu información personal y cualquier aplicación descargada?"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Borrar todo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Extrae tu patrón de desbloqueo"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Debes extraer tu patrón de desbloqueo para confirmar el restablecimiento de un teléfono."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"No se ha realizado ningún restablecimiento debido a que el servicio \"Borrar sistema\" no se encuentra disponible."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Formatear tarjeta SD."</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Borra todos los datos en la tarjeta SD"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Esta acción borrará la tarjeta SD en el teléfono. ¡Perderás TODA la información de la tarjeta!"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"Formatear tarjeta SD"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"¿Deseas formatear tarjeta SD y borrar todos tus medios? ¡Esta acción no se puede cambiar!"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Borrar almacenamiento USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Borrar la tarjeta SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Borra todos los datos del almacenamiento USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Borra todos los datos en la tarjeta SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Esta acción borrará el almacenamiento USB. ¡Perderás "<b>"todos"</b>" los datos almacenados allí!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Esta acción borrará la tarjeta SD. ¡Perderás "<b>"todos"</b>" los datos de la tarjeta!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Borrar almacenamiento USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Borrar la tarjeta SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"¿Deseas borrar el almacenamiento USB y suprimir todos los archivos almacenados allí? ¡Esta acción no se puede cambiar!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"¿Deseas borrar la tarjeta SD y suprimir todos los archivos almacenados allí? ¡Esta acción no se puede cambiar!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Borrar todo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Extrae tu patrón de desbloqueo"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Debes extraer tu patrón de desbloqueo parar confirmar un formato de tarjeta SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Debes establecer el gráfico de desbloqueo para confirmar que deseas borrar el almacenamiento USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Debes establecer el gráfico de desbloqueo para confirmar que deseas borrar la tarjeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Config. de llamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Establecer correo de voz, desvío de llamadas, llamada en espera, identificador de llamadas"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Anclaje a red USB"</string>
@@ -680,10 +713,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Error en el anclaje a red Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"No se puede realizar el anclaje a red con más de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ya no se anclará a red."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Configuraciones de anclaje a Bluetooth"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Selecciona los dispositivos de Bluetooth para anclaje"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes de celulares"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Establecer opciones para roaming, redes, APN"</string>
@@ -697,6 +728,9 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS asistido"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar el servidor para asistir el GPS (anular la selección para reducir el uso de la red)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar el servidor para asistir el GPS (anula la selección para mejorar el rendimiento del GPS)"</string>
+    <string name="use_location_title" msgid="3214740644957841179">"Utilizar la ubicación para buscar con Google"</string>
+    <string name="use_location_summary_disabled" msgid="1876901471649359806">"Utilizar la ubicación para buscar con Google y otros servicios de Google"</string>
+    <string name="use_location_summary_enabled" msgid="984549156918597265">"Ubicación utilizada para mejorar los resultados de la búsqueda y otros servicios de Google"</string>
     <string name="about_settings" msgid="1743378368185371685">"Acerca del teléfono"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Ver información legal, estado del teléfono, versión de software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
@@ -785,15 +819,21 @@
     <string name="unknown" msgid="1592123443519355854">"Desconocido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordenar por nombre"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Mostrar los servicios en ejecución"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Mostrar procesos almacenados en la memoria caché"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar el espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Seleccionar opciones de filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todos"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descargado"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En ejecución"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"En tarjeta SD"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamiento USB"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"En tarjeta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desactivado"</string>
     <string name="no_applications" msgid="5190227407135243904">"No hay aplicaciones."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Almacenamiento interno"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almacenamiento USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Desmontar tarjeta SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Recalculando el tamaño…"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Suprimir"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Todos los datos de esta aplicación se suprimirán de forma permanente. Esto incluye todos los archivos, las configuraciones, las cuentas, las bases de datos, etc."</string>
@@ -813,7 +853,8 @@
     <string name="version_text" msgid="9189073826278676425">"versión <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Mover al teléfono"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Mover a la tarjeta SD"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover a almacenamiento USB"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover a la tarjeta SD"</string>
     <string name="moving" msgid="6431016143218876491">"Moviendo"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"No queda suficiente espacio de almacenamiento."</string>
     <string name="does_not_exist" msgid="837163572898468245">"La aplicación no existe."</string>
@@ -826,18 +867,19 @@
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Error al mover la aplicación. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Ubicación de instalación preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Cambiar la ubicación de instalación preferida para nuevas aplicaciones"</string>
-    <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso del almacenamiento "</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso del almacenamiento"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Ver el almacenamiento que usan las aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Ver y controlar servicios actuales en ejecución"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Volver a comenzar"</string>
+    <string name="cached" msgid="1059590879740175019">"Proceso de fondo almacenado en memoria caché"</string>
     <string name="no_running_services" msgid="2059536495597645347">"No hay nada activo."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Comenzado por aplicación."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> disponible"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> en uso"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> libre"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> utilizado"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
@@ -850,14 +892,19 @@
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Procesos"</string>
     <string name="service_stop" msgid="6369807553277527248">"Detener"</string>
     <string name="service_manage" msgid="1876642087421959194">"Config."</string>
-    <string name="service_stop_description" msgid="3261798282116866961">"Este servicio fue iniciado por su aplicación. Detenerlo puede provocar que falle la aplicación. "</string>
+    <string name="service_stop_description" msgid="3261798282116866961">"Este servicio fue iniciado por su aplicación. Detenerlo puede provocar que falle la aplicación."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Esta aplicación no puede detenerse de manera segura. Al hacerlo, puedes perder parte de tu trabajo actual."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Este es un proceso de aplicación anterior que se conserva para obtener mayor velocidad en caso de que se lo necesite nuevamente. Generalmente no hay motivo para detenerlo."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: actualmente en uso. Toca los parámetros de configuración para controlarlo."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Proceso principal en uso."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"El servicio <xliff:g id="COMP_NAME">%1$s</xliff:g> está en uso."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"El proveedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está en uso."</string>
-    <string name="language_settings" msgid="502219872342167227">"Idioma &amp; del teclado"</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"¿Deseas detener el servicio?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"¿Estás seguro de que deseas detener el servicio del sistema? Si lo haces, algunas funciones de tu teléfono podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
+    <string name="language_settings" msgid="502219872342167227">"Idioma y teclado"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Idioma y Configuración del teclado"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Configuración de idiomas"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Configuración de teclado"</string>
     <string name="phone_language" msgid="1165758957501090679">"Seleccionar idioma"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Reemplazar automát."</string>
@@ -897,9 +944,13 @@
     <string name="input_method" msgid="5434026103176856164">"Método de entrada"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Administrar opciones de ingreso de texto"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configuración de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configuración del teclado en pantalla"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Teclado del dispositivo"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Configuración de teclado integrado"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Teclado incorporado"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Configuración del teclado físico incorporada"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Desarrollo"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Establecer opciones para desarrollar aplicaciones"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuración de USB"</string>
@@ -931,16 +982,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Este servicio de accesibilidad podrá recopilar todo el texto que escribas, incluido los números de tarjeta de crédito de tus datos personales, excepto las contraseñas. También podrá registrar las interacciones de tu interfaz de usuario. Proviene de la aplicación <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. ¿Deseas utilizar este servicio de accesibilidad?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"¿Deseas desactivar la accesibilidad?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"No se encontraron aplicaciones relacionadas a la accesibilidad."</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"No has instalado ninguna aplicación relacionada a la accesibilidad."\n\n"Puedes descargar un lector de pantalla para tu dispositivo desde la tienda Android."\n\n"Haz clic en Aceptar para instalar el lector de pantalla."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Scripts de accesibilidad"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Descarga los scripts de accesibilidad"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Permite que las aplicaciones descarguen scripts de accesibilidad desde Google."</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Algunas aplicaciones pueden solicitar que Google descargue scripts a tu teléfono para hacer más accesible su contenido. ¿Estás seguro de que quieres permitir que Google instale scripts de accesibilidad en tu teléfono?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Botón de encendido"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"El botón de encendido finaliza la llamada."</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Durante una llamada, presionar Power (encender) finaliza la llamada, en lugar de apagar la pantalla."</string>
@@ -953,14 +999,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Cargando"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Pantalla encendida"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS encendido"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"WIFI"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Encender"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Señal del teléfono "</string>
+    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Señal del teléfono"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Hora de activación del dispositivo"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"WiFi a tiempo"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"WiFi a tiempo"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi a tiempo"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi a tiempo"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Detalles de uso de la batería"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Utilizar detalles"</string>
@@ -976,8 +1022,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantener en funcionamiento"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi en funcionamiento"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Teléfono"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Datos enviados"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Datos recibidos"</string>
@@ -989,7 +1034,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Información de aplicación"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Configuración de aplicación"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Configuración de visualización"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Configuración de WiFi"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Configuración Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Config. de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"La batería está siendo utilizada por llamadas de voz"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"La batería se utiliza cuando el teléfono está inactivo"</string>
@@ -1142,8 +1187,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Permitir a las aplic. acceder a certificados seguros y otras cred."</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ingresar contraseña"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Ingresar la contraseña de almacenamiento de la credencial"</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Instalar de la tarjeta SD"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Instalar certificados encriptados de la tarjeta SD"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalar desde almacenamiento USB"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalar de la tarjeta SD"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Instalar certificados encriptados del almacenamiento USB"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instalar certificados encriptados de la tarjeta SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Establecer contraseña"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Establecer o cambiar la contraseña de almacenamiento de la credencial"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Borrar almacenamiento"</string>
@@ -1180,11 +1227,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Hacer una copia de seguridad y restaurar"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos personales"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Hacer una copia de seguridad de mis datos"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Hacer una copia de seguridad de mi configuración y de otros datos de la aplicación"</string>
-    <string name="auto_restore_title" msgid="5397528966329126506">"Restaurar automáticamente "</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Si reinstalo una aplicación, restablecer las configuraciones o los otros datos con copia de seguridad."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Hacer copias de seguridad de los datos de la aplicación, de las contraseñas de Wi-Fi, y otra configuración en los servidores de Google"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"Restaurar automáticamente"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Si reinstalo una aplicación, restablecer las configuraciones o los otros datos con copia de seguridad"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Copia de seguridad"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"¿Estás seguro de que deseas dejar de hacer copias de seguridad de tu configuración y aplicaciones, y borrar todas las copias de los servidores de Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"¿Estás seguro de que deseas dejar de hacer copias de seguridad de tus contraseñas de Wi-Fi, marcadores y otros datos de configuración y aplicaciones, y borrar todas las copias de los servidores de Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configuración de la administración del dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador del dispositivo"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Desactivar"</string>
@@ -1206,35 +1253,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualizar lista"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Omitir"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Siguiente"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Explorando redes..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Toca para seleccionar red"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conectar a la red existente"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Ingresar configuración de red"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Conectar a la red nueva"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Conectando..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Conectado"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Proceder con el siguiente paso"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"En este momento la sincronización experimenta problemas. Volverá en breve."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Agregar cuenta"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Configuración de sincronización general"</string>
+    <string name="background_data" msgid="5779592891375473817">"Datos de fondo"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Las aplic.  pueden sincronizar, enviar y  recibir datos en cualq. mom."</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Atención"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Al desactivar los datos de fondo, se prolonga la vida útil de la batería y se reduce el uso de los datos. Algunas aplicaciones incluso pueden utilizar una conexión de datos de fondo."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Sincronización automática"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Las aplicaciones sincronizan los datos automáticamente."</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Administrar cuentas"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sincronización activada"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sincronización desactivada"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Error de sincronización"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index e3d3d2f..9882dc3 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"Protocolo DHCP"</item>
+    <item msgid="628395202971532382">"IP estática"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desconectado"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9152267..f5d89d9 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Desactivar tarjeta SD"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Formatear tarjeta SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Desactivar USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desactivar tarjeta SD"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Borrar almacenamiento USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Borrar tarjeta SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Pequeño"</string>
     <string name="medium_font" msgid="2068475425515133701">"Mediano"</string>
     <string name="large_font" msgid="599055175160971446">"Grande"</string>
     <string name="font_size_save" msgid="3450855718056759095">"Aceptar"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"Tarjeta SD"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Almacenamiento USB"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Tarjeta SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Estado de la batería:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Cargar batería:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Nivel de batería:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Agotada"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Sobretensión"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconocido"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Ajustes de Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Visible"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Visible durante <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos..."</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Iniciar <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Cuenta:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Ajustes de proxy"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Definir el proxy HTTP global y las listas de exclusión"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Borrar"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Puerto"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Sin proxy para"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar valores predeterminados"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Listo"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Nombre de host"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atención"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Aceptar"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"El nombre de host introducido no es válido."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"La lista de exclusión que has escrito no es correcta. Introduce una lista separada por comas de dominios excluidos."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Debes completar el campo de puerto."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo de portal debe estar vacío si el campo de host también lo está."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"El puerto introducido no es válido."</string>
@@ -189,16 +189,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Los cambios se aplican cuando se vuelve a conectar el cable USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Habilitar almacenamiento masivo USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Bytes totales:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Falta la tarjeta SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Almacenamiento USB no activado"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Falta la tarjeta SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bytes disponibles:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"La tarjeta SD se está utilizando como dispositivo de almacenamiento masivo."</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"Es seguro extraer la tarjeta SD"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"La tarjeta SD se ha extraído mientras estaba en uso."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB como almacenamiento masivo"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"La tarjeta SD se está utilizando como dispositivo de almacenamiento masivo."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Es seguro extraer el USB."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Es seguro extraer la tarjeta SD"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB extraído en uso"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La tarjeta SD se ha extraído mientras estaba en uso."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes utilizados:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Buscando medios en tarjeta SD..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"Tarjeta SD activada en modo de solo lectura"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Buscando archivos almac USB…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Buscando medios en tarjeta SD..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB activado solo lectura"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Tarjeta SD activada en modo de solo lectura"</string>
+    <string name="skip_label" msgid="47510779345218297">"Omitir"</string>
     <string name="next_label" msgid="4693520878012668114">"Siguiente"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Idioma"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Seleccionar actividad"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Información sobre la batería"</string>
     <string name="display_label" msgid="7403874003169865762">"Pantalla"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Información sobre el teléfono"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"Tarjeta SD"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Almacenamiento USB"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Tarjeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Ajustes de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ajustes"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Ajustes"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Ajustes"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo avión"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Inhabilitar todas las conexiones inalámbricas"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleccionar un operador de red"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Establecer fecha, hora, zona horaria y formatos"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Fecha y hora automáticas"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar hora proporcionada por la red"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usar hora proporcionada por la red"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Zona horaria automática"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar zona horaria proporcionada por la red"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Formato de 24 horas"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Establecer hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar zona horaria"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Bloquear dispositivo tras tiempo de espera"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Ajustar el tiempo de retraso antes de que el dispositivo se bloquee automáticamente"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Ubicación y seguridad"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Ajustes de seguridad y de ubicación"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administración de dispositivos"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Seleccionar administradores de dispositivos"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Añadir o eliminar administradores de dispositivos"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Seleccionar administradores de dispositivos"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Añadir o eliminar administradores de dispositivos"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Ajustes de Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Ajustes de Bluetooth"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz del teléfono"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y contenido multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ajustes de recordatorio"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Usar Comunicación de campo cercano (NFC) para leer e intercambiar etiquetas"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Ajustes de Wi-Fi"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Establecer conexión con red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Borrar red"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar red"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Configuración de red"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Introducir PIN de punto de acceso"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID de red"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidad anónima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Contraseña"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contraseña"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Ajustes de IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(sin modificar)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(no especificados)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Recordada"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Inhabilitada"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de rango"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Protegida con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Protegida con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Protegida con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS disponible)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, protegida con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Establecer conexión"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Borrar"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Ajustes de IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Guardar"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancelar"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Introduce una dirección IP válida."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Puerta de enlace"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Máscara de red"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> de zona Wi-Fi portátil activa"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de zona Wi-Fi portátil"</string>
@@ -460,7 +479,7 @@
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Ajustes de sonido"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencio"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"Silenciar todos los sonidos, excepto el contenido multimedia y las alarmas "</string>
+    <string name="silent_mode_summary" msgid="3309650676072917899">"Silenciar todos los sonidos, excepto el contenido multimedia y las alarmas"</string>
     <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Todos los sonidos excepto los multimedia están silenciados."</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono del teléfono"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Número de teléfono, señal, etc."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Desactivar tarjeta SD, ver almacenamiento disponible."</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Almacenam seguro y compar"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Almacenamiento"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Ajustes de almacenamiento"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desactivar almacenamiento USB, ver almacenamiento disponible"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desactivar tarjeta SD, ver almacenamiento disponible."</string>
     <string name="status_number" msgid="5123197324870153205">"Mi número de teléfono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versión de PRL"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tiempo de actividad"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tiempo de actividad"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Almacenamiento interno del teléfono"</string>
-    <string name="sd_memory" msgid="151871913888051515">"Tarjeta SD"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Almacenamiento interno"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Almacenamiento USB"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Tarjeta SD"</string>
     <string name="memory_available" msgid="418542433817289474">"Espacio disponible"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espacio total"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Desactivar tarjeta SD"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Desactiva la tarjeta SD antes de extraerla para evitar la pérdida de datos."</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar almacenam comp"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactivar tarjeta SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desactivar almacenamiento USB interno"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desactivar la tarjeta SD para extraerla de forma segura"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Habilitar modo PTP"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Aparece en USB como un dispositivo de cámara PTP en lugar de como un dispositivo MTP."</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Insertar una tarjeta SD para el montaje"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Activar tarjeta SD"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Activar tarjeta SD"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Formatear tarjeta SD"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Formatear (borrar) la tarjeta SD"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Insert alm USB para activ"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insertar una tarjeta SD para el montaje"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Activar almacenam compart"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Activar tarjeta SD"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Activar almacenam USB interno"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Activar tarjeta SD"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Borrar almacenamiento USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Borrar tarjeta SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Borr dat USB intern (mús, fot)"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Permite borrar todos los datos de la tarjeta SD del teléfono, como la música y las fotos"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"No disponible"</string>
     <string name="read_only" msgid="6702420168629076340">" (Sólo lectura)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Desactivar tarjeta SD"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Si desactivas la tarjeta SD, se detendrán algunas aplicaciones que estás utilizando y estas no estarán disponibles hasta que la vuelvas a activar."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"No se ha podido desactivar la tarjeta SD."</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"No se puede desactivar la tarjeta SD. Vuelve a intentarlo más tarde."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"Se va a desmontar la tarjeta SD. Puedes consultar el estado en el área de notificaciones."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Desactivar USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Desactivar tarjeta SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Si desactivas el almacenamiento USB, algunas aplicaciones que estás utilizando se detendrán y no estarán disponibles hasta que lo vuelvas a activar."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Si desactivas la tarjeta SD, se detendrán algunas aplicaciones que estás utilizando y estas no estarán disponibles hasta que la vuelvas a activar."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Error al desactivar USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"No se ha podido desactivar la tarjeta SD."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"No se puede desactivar el almacenamiento USB. Vuelve a intentarlo más tarde."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"No se puede desactivar la tarjeta SD. Vuelve a intentarlo más tarde."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Se desactivará el almacenamiento USB."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Se desactivará la tarjeta SD."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desmontando"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"La tarjeta SD se está desactivando."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de la batería"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Restablecimiento de la configuración de APN predeterminada completado"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer datos de fábrica"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Borrar todos los datos del teléfono"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Se borrarán todos los datos del teléfono, incluidos los siguientes elementos:"\n<li>"tu cuenta de Google,"</li>\n<li>"la configuración y los datos de las aplicaciones y del sistema,"</li>\n<li>"las aplicaciones descargadas."</li>\n"No se borrarán los siguientes elementos:"\n<li>"las aplicaciones agrupadas y el software del sistema actual,"</li>\n<li>"los archivos de la tarjeta SD como, por ejemplo, música o fotografías."</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, incluidos: la configuración y los datos de aplicaciones y del sistema de "\n\n<li>"tu cuenta de Google"</li>\n<li>","</li>\n<li>"las aplicaciones descargadas."</li>\n\n"Para eliminar todos los datos de este teléfono, debes borrar el "<b>"almacenamiento USB"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, incluidos: la configuración y los datos de aplicaciones y del sistema de "\n\n<li>"tu cuenta de Google"</li>\n<li>","</li>\n<li>"las aplicaciones descargadas."</li>\n\n"Si también quieres eliminar la música, las imágenes y otros datos de usuario, debes borrar la "<b>"tarjeta SD"</b>"."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Borrar almacenamiento USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Borrar tarjeta SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Borr dat USB intern (mús, fot)"</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Borra todos los datos de la tarjeta SD, como música y fotos"</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Reiniciar teléfono"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"¿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" msgid="5390908019019242910">"Borrar todo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Crea tu patrón de desbloqueo."</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Debes crear un patrón de desbloqueo para confirmar el reinicio del teléfono."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"No se ha reiniciado el sistema porque el servicio Borrado del sistema no está disponible."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Formatear tarjeta SD"</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Borra todos los datos de la tarjeta SD."</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Esta acción borrará el contenido de la tarjeta SD del teléfono. Perderás TODOS los datos de la tarjeta."</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"Formatear tarjeta SD"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"¿Quieres formatear la tarjeta SD y borrar todos los datos? Esta acción no se puede deshacer."</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Borrar almacenamiento USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Borrar tarjeta SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Borra los datos de USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Borra todos los datos de la tarjeta SD."</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Se borrará el almacenamiento USB y perderás "<b>"todos"</b>" los datos almacenados."</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Se borrará el contenido de la tarjeta SD y perderás "<b>"todos"</b>" los datos de la tarjeta."</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Borrar almacenamiento USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Borrar tarjeta SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"¿Quieres borrar el almacenamiento USB y eliminar todos sus archivos? Esta acción no se puede deshacer."</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"¿Quieres borrar la tarjeta SD y eliminar todos sus archivos? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Borrar todo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Crea tu patrón de desbloqueo."</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Debes crear un patrón de desbloqueo para confirmar el formato de la tarjeta SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar el almacenamiento USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar la tarjeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ajustes de llamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar buzón, llamada en espera, desvío e identificador"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Anclaje de USB"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Error de anclaje de Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"No se puede anclar a más de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Se desactivará el anclaje a red de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Ajustes de anclaje de Bluetooth"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Seleccionar dispositivos Bluetooth para activar anclaje"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Establecer opciones para itinerancia, redes, APN"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS asistido"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar el servidor para asistir al GPS (desactivar para reducir el uso de la red)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar el servidor para asistir al GPS (desactivar para mejorar el rendimiento del GPS)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Utilizar Mi ubicación"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Acerca del teléfono"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Ver información legal, estado del teléfono, versión del software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Desconocido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordenar por nombre"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Mostrar serv en ejecución"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Mostr proc almac en caché"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Seleccionar opciones de filtrado"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todas"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descargada"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En ejecución"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"En tarjeta SD"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamiento USB"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"En tarjeta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Inhabilitada"</string>
     <string name="no_applications" msgid="5190227407135243904">"Sin aplicaciones"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Almac interno"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almacenamiento USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Tarjeta SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Recalculando tamaño..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Eliminar"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Todos los datos de la aplicación se eliminarán de forma permanente, incluidos todos los archivos, la configuración, las cuentas, las bases de datos, etc."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"versión <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Mover al teléfono"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Mover a la tarjeta SD"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover a almacenamiento USB"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover a la tarjeta SD"</string>
     <string name="moving" msgid="6431016143218876491">"Moviendo"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"No queda suficiente espacio de almacenamiento."</string>
     <string name="does_not_exist" msgid="837163572898468245">"La aplicación especificada no existe."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Ubicación de instalación preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Modificar ubicación de instalación preferida para nuevas aplicaciones"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso de almacenamiento"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Ver almacenamiento utilizado por aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Ver y controlar los servicios en ejecución"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Reiniciando"</string>
+    <string name="cached" msgid="1059590879740175019">"Proceso en segundo plano almacenado en caché"</string>
     <string name="no_running_services" msgid="2059536495597645347">"No hay nada en ejecución."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Iniciado por la aplicación."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> disponible"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> en uso"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> libre"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> en uso"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proceso y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Ajustes"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Servicio iniciado por su aplicación. Si se detiene, se puede producir un error en la aplicación."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"No se puede detener la aplicación de forma segura. Si lo haces, puedes perder parte de tu trabajo."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Se trata de un proceso de aplicación antiguo que se mantiene para mejorar la velocidad si vuelve a ser necesario. Normalmente, no es necesario detenerlo."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: actualmente en uso. Toca en \"Ajustes\" para controlarlo."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Proceso principal en uso"</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Servicio <xliff:g id="COMP_NAME">%1$s</xliff:g> en uso"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Proveedor <xliff:g id="COMP_NAME">%1$s</xliff:g> en uso"</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"¿Deseas detener el servicio del sistema?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"¿Estás seguro de que deseas detener este servicio del sistema? Si lo haces, algunas utilidades podrían dejar de funcionar correctamente hasta que apagues el teléfono y vuelvas a encenderlo."</string>
     <string name="language_settings" msgid="502219872342167227">"Idioma y teclado"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ajustes de teclado y de idioma"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Ajustes de idioma"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Ajustes de teclado"</string>
     <string name="phone_language" msgid="1165758957501090679">"Seleccionar idioma"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Corrección automática"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Introducción de texto"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Administrar opciones de introducción de texto"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Ajustes de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ajustes de teclado en pantalla"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Teclado del dispositivo"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Ajustes del teclado integrado"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Teclado integrado"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Ajustes de teclado físico integrado"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Desarrollo"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Establecer opciones de desarrollo de aplicaciones"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuración USB"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Este servicio de accesibilidad puede recopilar todo lo 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 utilizar este servicio de accesibilidad?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"¿Quieres inhabilitar la accesibilidad?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"No se han encontrado aplicaciones relacionadas con la accesibilidad."</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"No tienes instaladas aplicaciones relacionadas con la accesibilidad."\n\n"Puedes descargar un lector de pantalla para tu dispositivo en Android Market."\n\n"Haz clic en \"Aceptar\" para instalar el lector de pantalla."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Scripts de accesibilidad"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Descargar scripts de accesibilidad"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Permitir a aplicaciones descargar scripts accesibilidad de Google"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Algunas aplicaciones pueden solicitar a Google que descargue scripts en tu teléfono para poder acceder a su contenido más fácilmente. ¿Estás seguro de que quieres permitir que Google instale scripts de accesibilidad en tu teléfono?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Botón de encendido"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Colgar"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"La llamada finalizará al pulsar el botón de encendido."</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Cargando..."</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Pantalla encendida"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activado"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"WIFI"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Activa"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Señal del teléfono"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Tiempo de actividad del dispositivo"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"Tiempo de conexión WiFi"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"Tiempo de conexión WiFi"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Tiempo de conexión WiFi"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Tiempo de conexión WiFi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Detalles de uso de la batería"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantener activo"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"WiFi en funcionamiento"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Teléfono"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Datos enviados"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Datos recibidos"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Información de la aplicación"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Ajustes de aplicaciones"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Ajustes de pantalla"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Ajustes WiFi"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Ajustes de Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Ajustes de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batería utilizada por llamadas de voz"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Batería utilizada cuando el teléfono está inactivo"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Permitir que las aplicaciones accedan a los certificados seguros y a otras credenciales"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introducir contraseña"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Introduce la contraseña de almacenamiento de credenciales."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Instalar desde la tarjeta SD"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Instalar certificados encriptados de tarjeta SD"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalar desde almac USB"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalar desde la tarjeta SD"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Inst cert encr de alm USB"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instalar certificados encriptados de tarjeta SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Establecer contraseña"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Establecer o cambiar la contraseña de almacenamiento de credenciales"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Borrar almacenamiento"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Copia de seguridad y restauración"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos personales"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Copia de seguridad de datos"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Copia de seguridad de ajustes y otros datos de aplicación"</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Realizar copia de seguridad en servidores de Google de datos de aplicaciones, contraseñas Wi-Fi y otras opciones de configuración"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Restaurar ajustes con copia de seguridad y otros datos si vuelvo a instalar una aplicación"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Restaurar ajustes con copia de seguridad y otros datos si vuelvo a instalar una aplicación"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Copia de seguridad"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"¿Estás seguro de que quieres detener la copia de seguridad de la configuración y de los datos de aplicación y borrar todas las copias de los servidores de Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"¿Estás seguro de que quieres detener la copia de seguridad de las contraseñas WiFi, de los marcadores y de otros datos de aplicaciones y opciones de configuración y borrar todas las copias de los servidores de Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ajustes de administración de dispositivos"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador de dispositivos"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Desactivar"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualizar lista"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Omitir"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Siguiente"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Buscando redes..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Tocar para seleccionar una red"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Establecer conexión con red existente"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Introducir configuración de red"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Establecer conexión con red nueva"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Conectando..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Conectado"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Ir al siguiente paso"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"En este momento hay problemas con la sincronización. Se restablecerá en breve."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Añadir cuenta"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Ajustes sincronización general"</string>
+    <string name="background_data" msgid="5779592891375473817">"Datos de referencia"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplicaciones pueden sincronizar datos, enviarlos, recibirlos."</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Atención"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Si inhabilitas los datos de referencia, aumentarás la duración de la batería y reducirás el uso de datos. Es posible que algunas aplicaciones sigan utilizando la conexión de datos de referencia."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Sincronización automát."</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Las aplicaciones sincronizan los datos de forma automática."</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Administrar cuentas"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sincronización activa"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"La sincronización está desactivada."</string>
+    <string name="sync_error" msgid="5060969083117872149">"Error sincronización"</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 1083157..c6b831c 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"Protocole DHCP"</item>
+    <item msgid="628395202971532382">"Statique"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Désactivé"</item>
     <item msgid="3165868966179561687">"Alerte"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 21d6a57..13bc83f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID ou IDC"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Retirer la carte SD"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Formater la carte SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Désinstaller mémoire USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Retirer la carte SD"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Effacer la mémoire de stockage USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Effacer la carte SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Petite"</string>
     <string name="medium_font" msgid="2068475425515133701">"Moyenne"</string>
     <string name="large_font" msgid="599055175160971446">"Grande"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"Carte SD"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Mémoire de stockage USB"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Carte SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"État de la batterie :"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Prise électrique :"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Batterie :"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Vide"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Voltage dépassé"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erreur inconnue"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Identifiable"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Identifiable pendant <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secondes..."</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Démarrer <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Compte :"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Paramètres proxy"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Définir le proxy HTTP global et les listes d\'exclusion"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Effacer"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Aucun proxy pour"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Rétablir les paramètres par défaut"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"OK"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Nom de l\'hôte"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Avertissement"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Le nom d\'hôte saisi n\'est pas valide."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Le format de la liste d\'exclusions spécifiée n\'est pas correct. Veuillez séparer les noms de domaine à exclure par une virgule."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Vous devez renseigner le champ Port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Le champ Port doit rester vide si le champ Hôte n\'est pas renseigné."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Le port indiqué n\'est pas valide."</string>
@@ -187,18 +187,23 @@
     <string name="band_mode_failed" msgid="1495968863884716379">"Échec"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"OK"</string>
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Les modifications prendront effet lors de la prochaine connexion du câble USB."</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Activer le stockage de masse USB"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Activer la mémoire de stockage de masse USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Octets au total :"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Aucune carte SD n\'a été trouvée."</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Mémoire de stockage USB non installée"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Aucune carte SD n\'a été trouvée."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Octets disponibles :"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"La carte SD est utilisée comme périphérique de stockage."</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"Vous pouvez maintenant retirer la carte SD en toute sécurité."</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"La carte SD a été retirée pendant son utilisation !"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Mémoire USB utilisée comme stockage de masse"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"La carte SD est utilisée comme périphérique de stockage."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Retirez la mémoire USB en toute sécurité."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Vous pouvez maintenant retirer la carte SD en toute sécurité."</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Mémoire USB retirée en cours d\'utilisation"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La carte SD a été retirée pendant son utilisation !"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Octets utilisés :"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Recherche de fichiers multimédias sur la carte SD…"</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"Carte SD montée en lecture seule"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Recherche de médias sur USB…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Recherche de fichiers multimédias sur la carte SD…"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Mémoire de stockage USB en lecture seule"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Carte SD montée en lecture seule"</string>
+    <string name="skip_label" msgid="47510779345218297">"Passer"</string>
     <string name="next_label" msgid="4693520878012668114">"Suivant"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Langue"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Sélectionner une activité"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Informations sur la batterie"</string>
     <string name="display_label" msgid="7403874003169865762">"Afficher"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Informations sur le téléphone"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"Carte SD"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Mémoire USB"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Carte SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Paramètres proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuler"</string>
     <string name="settings_label" msgid="1626402585530130914">"Paramètres"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Paramètres"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Paramètres"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mode avion"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Désactiver toutes les connexions sans fil"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Choisir un opérateur réseau"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Date et heure"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Configurer la date, l\'heure, le fuseau horaire et les formats"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Date/Heure automatique"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utiliser la date et l\'heure fournies par le réseau"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utiliser la date et l\'heure fournies par le réseau"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Fuseau horaire automatique"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utiliser le fuseau horaire fourni par le réseau"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utiliser le fuseau horaire fourni par le réseau"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Utiliser le format 24 h"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Définir l\'heure"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Définir le fuseau horaire"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Trier par fuseau horaire"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Une fois en veille, verrouiller le mobile après"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Définir le délai avant le verrouillage automatique du mobile"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Localisation et sécurité"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Paramètres de sécurité et localisation"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuler"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administration du périphérique"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Administrateurs"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Ajouter ou supprimer des administrateurs de périphérique"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Administrateurs"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ajouter ou supprimer des administrateurs de périphérique"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activer le Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Paramètres Bluetooth"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Utiliser la communication en champ proche pour lire et échanger des tags"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activer le Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Paramètres Wi-Fi"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Se connecter au réseau"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Retirer le réseau"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifier le réseau"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Configuration du réseau"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Tapez un code d\'accès depuis un point d\'accès"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID du réseau"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sécurité"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identité"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Mot de passe"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Afficher le mot de passe"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Paramètres IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(aucune modification)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non spécifié)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Réseaux enregistrés"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Désactivé"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Hors de portée"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Sécurisé par <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Sécurisé par <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Sécurisé par <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS disponible)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, sécurisé par <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Se connecter"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Retirer"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Paramètres IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Enregistrer"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Annuler"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Saisissez une adresse IP valide."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Passerelle"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Masque de réseau"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi mobile"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Point d\'accès Wi-Fi mobile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actif"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erreur liée au point d\'accès Wi-Fi mobile"</string>
@@ -501,7 +520,7 @@
     <string name="dock_settings_title" msgid="9161438664257429372">"Paramètres station d\'accueil"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Paramètres station d\'accueil bureau associée"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Paramètres station d\'accueil voiture associée"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Paramètres support voiture associé"</string>
     <string name="dock_audio_summary_none" msgid="289909253741048784">"Le téléphone n\'est pas sur sa base."</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Paramètres station d\'accueil associée"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Station d\'accueil introuvable"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"État"</string>
     <string name="device_status" msgid="607405385799807324">"État"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Numéro de téléphone, signal, etc."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Retirer la carte SD, afficher la mémoire disponible"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Stockage partagé sécurisé"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Stockage"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Paramètres de stockage"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Désinstaller la mémoire de stockage USB, afficher l\'espace disponible"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Retirer la carte SD, afficher la mémoire disponible"</string>
     <string name="status_number" msgid="5123197324870153205">"Mon numéro de téléphone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Version PRL"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Non disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Durée d\'activité"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temps en activité"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Mémoire interne du téléphone"</string>
-    <string name="sd_memory" msgid="151871913888051515">"Carte SD"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Mémoire de stockage interne"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Mémoire de stockage USB"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Carte SD"</string>
     <string name="memory_available" msgid="418542433817289474">"Espace disponible"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espace total"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Désactiver la carte SD"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Désactiver la carte SD pour la retirer en toute sécurité"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Démonter stockage partagé"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Désactiver la carte SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Désinstaller mémoire USB interne"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Désinstaller la carte SD pour la retirer en toute sécurité"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Activer le mode PTP"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Apparaître via USB comme un appareil photo PTP, pas comme un mobile MTP"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Insérer la carte SD à monter"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Monter la carte SD"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Monter la carte SD"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Formater la carte SD"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Formater (effacer) la carte SD"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Insérer mémoire USB à installer"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insérer la carte SD à monter"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Monter stockage partagé"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Monter la carte SD"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Installer la mémoire USB interne"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Monter la carte SD"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Effacer la mémoire USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Effacer la carte SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Effacer les données de la mémoire USB interne (ex. : musique, photos)"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Effacer toutes les données de la carte SD, telles que la musique et les photos"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Non disponible"</string>
     <string name="read_only" msgid="6702420168629076340">" (Lecture seule)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Désactiver la carte SD"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Si vous désactivez la carte SD, certaines applications que vous utilisez s\'arrêteront et risquent de ne plus être disponibles tant que vous n\'aurez pas réactivé la carte SD."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Échec de la désactivation de la carte SD"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Impossible de désactiver la carte SD. Réessayez ultérieurement."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"La carte SD sera désactivée. Pour connaître l\'état de la carte, consultez la zone de notification."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Désinstaller la mémoire de stockage USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Désactiver la carte SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Si vous désactivez la mémoire de stockage USB, certaines applications en cours d\'utilisation seront fermées. Elles risquent de rester indisponibles jusqu\'à ce que la mémoire de stockage USB soit réactivée."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Si vous désactivez la carte SD, certaines applications que vous utilisez s\'arrêteront et risquent de ne plus être disponibles tant que vous n\'aurez pas réactivé la carte SD."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Impossible de désinstaller USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Échec de la désactivation de la carte SD"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Impossible de désinstaller la mémoire de stockage USB. Réessayez ultérieurement."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Impossible de désactiver la carte SD. Réessayez ultérieurement."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"La mémoire de stockage USB va être désinstallée."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"La carte SD va être démontée."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Désactivation en cours"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Désactivation en cours"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"État de la batterie"</string>
@@ -607,7 +639,7 @@
     <string name="apn_not_set" msgid="7422262558097875757">"&lt;Non défini&gt;"</string>
     <string name="apn_name" msgid="4115580098369824123">"Nom"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
-    <string name="apn_http_proxy" msgid="1826885957243696354">"Proxy "</string>
+    <string name="apn_http_proxy" msgid="1826885957243696354">"Proxy"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"Port"</string>
     <string name="apn_user" msgid="455637547356117761">"Nom d\'utilisateur"</string>
     <string name="apn_password" msgid="5412301994998250968">"Mot de passe"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Réinitialisation des paramètres APN par défaut terminée"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restaurer valeurs d\'usine"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Effacer toutes les données du téléphone"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Toutes les données de votre téléphone vont être supprimées, en particulier :"\n<li>"votre compte Google"</li>\n<li>"les paramètres et données des applications et du système "</li>\n<li>"les applications téléchargées"</li>\n"Les éléments suivants ne seront pas supprimés :"\n<li>"les logiciels système actuels et les applications pré-installées "</li>\n<li>"les fichiers présents sur la carte SD (par ex. photos et musique)"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Cette action effacera toutes les données de la mémoire de "<b>"stockage interne"</b>" de votre mobile, y compris :"\n\n<li>"Votre compte Google"</li>\n<li>"Les données et les paramètres des applications et du système"</li>\n<li>"Les applications téléchargées"</li>\n\n"Pour supprimer toutes les données de votre mobile, vous devez également effacer la mémoire de "<b>"stockage USB"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, notamment :"\n\n<li>"Votre compte Google"</li>\n<li>"Les données et les paramètres des applications et du système"</li>\n<li>"Les applications téléchargées"</li>\n\n"Pour supprimer également la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Effacer la mémoire USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Effacer la carte SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Effacer les données de la mémoire USB interne (ex. : musique, photos)."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Effacer les données de la carte SD (ex. : musique, photos)"</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Réinitialiser le téléphone"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"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" msgid="5390908019019242910">"Tout effacer"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Saisissez votre schéma de déverrouillage"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Vous devez dessiner votre schéma de déverrouillage pour confirmer la réinitialisation du téléphone."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"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" msgid="4671276096695789895">"Formater la carte SD."</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Permet d\'effacer toutes les données de la carte SD"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Cette action effacera la carte SD du téléphone. TOUTES les données de la carte seront perdues !"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"Formater la carte SD"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Formater la carte SD en effaçant tout le contenu de la carte ? Impossible d\'annuler cette action !"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Effacer la mémoire USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Effacer la carte SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Efface les données de la mémoire USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Permet d\'effacer toutes les données de la carte SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Cette action effacera la mémoire de stockage USB. "<b>"Toutes"</b>" les données qu\'elle contient seront perdues."</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Cette action effacera la carte SD. "<b>"Toutes"</b>" les données de la carte seront perdues."</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Effacer la mémoire USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Effacer la carte SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Effacer la mémoire de stockage USB en supprimant tous les fichiers qu\'elle contient ? Cette action est irréversible."</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Effacer la carte SD en supprimant tous les fichiers qu\'elle contient ? Cette action est irréversible."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Tout effacer"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Créez votre schéma de déverrouillage"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Vous devez créer votre schéma de déverrouillage pour confirmer le format de la carte SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Dessinez votre schéma de déverrouillage pour confirmer l\'effacement de la mémoire de stockage USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Vous devez créer votre schéma de déverrouillage pour confirmer l\'effacement de la carte SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Paramètres d\'appel"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurer mess. vocale, transferts d\'appel, mises en attente, numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Partage de conn. par USB"</string>
@@ -670,7 +713,7 @@
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Via USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Connexion USB établie, cochez l\'option adéquate pour partager la connexion."</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Partage de connexion en cours"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Impossible de partager la connexion lorsqu\'un stockage USB est utilisé."</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Impossible de partager la connexion lorsqu\'une mémoire de stockage USB est utilisée."</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB non connecté"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erreur liée au partage de connexion via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Partage de conn Bluetooth"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Erreur de partage de connexion Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Partage de conn. impossible au-delà de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> mobiles"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Le partage de conn. avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être annulé."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Paramètres de partage de connexion Bluetooth"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Sélectionnez les périphériques Bluetooth à partager"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Réseaux mobiles"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Définir les options d\'itinérance, réseaux, noms de points d\'accès"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Utiliser le GPS assisté"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utiliser le serveur pour assister le GPS (désactiver pour réduire l\'utilisation du réseau)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utiliser le serveur pour assister le GPS (désactiver pour améliorer les performances du GPS)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Utiliser ma position"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"À propos du téléphone"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Informations légales, état du téléphone et version du logiciel"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informations légales"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Inconnu"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Trier par nom"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Trier par taille"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Afficher les services"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Voir processus en cache"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gérer l\'espace"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrer"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Options du filtre"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Toutes"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Téléchargées"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En cours d\'exécution"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"Sur la carte SD"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Mémoire de stockage USB"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sur la carte SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Désactivée"</string>
     <string name="no_applications" msgid="5190227407135243904">"Aucune application"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Stockage interne"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Mémoire USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Carte SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Calcul de la taille..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Supprimer"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Toutes les données de cette application vont être définitivement supprimées, y compris tous les fichiers, les paramètres, les comptes, les bases de données, etc."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Déplacer"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Déplacer vers le téléphone"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Déplacer vers la carte SD"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Déplacer vers USB"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Déplacer vers la carte SD"</string>
     <string name="moving" msgid="6431016143218876491">"Déplacement en cours"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"L\'espace de stockage restant est insuffisant."</string>
     <string name="does_not_exist" msgid="837163572898468245">"Cette application n\'existe pas."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Emplacement d\'installation souhaité"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Modifiez l\'emplacement d\'installation par défaut pour les nouvelles applications."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilisation du stockage"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Afficher l\'espace de stockage utilisé par les applications"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Services en cours d\'exécution"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Afficher et contrôler les services en cours d\'exécution"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Redémarrage en cours"</string>
+    <string name="cached" msgid="1059590879740175019">"Processus d\'arrière-plan en cache"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Pas de services en cours"</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Service démarré par l\'application"</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> disponible"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"En cours d\'utilisation : <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> gratuit"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> utilisé"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processus et <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Paramètres"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Ce service a été démarré par son application. Si vous l\'arrêtez, cette dernière risque de se bloquer."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Impossible d\'arrêter correctement cette application. Si vous continuez, vous risquez de perdre une partie des travaux en cours."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Processus d\'une ancienne application conservé pour permettre une vitesse accrue si besoin. Il ne doit généralement pas être arrêté."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"En cours d\'utilisation : <xliff:g id="CLIENT_NAME">%1$s</xliff:g>. Appuyez sur Paramètres pour contrôler ce client."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Principal processus actuellement utilisé"</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Le service <xliff:g id="COMP_NAME">%1$s</xliff:g> est actuellement utilisé."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"L\'opérateur <xliff:g id="COMP_NAME">%1$s</xliff:g> est actuellement utilisé."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Arrêter le service système ?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Voulez-vous vraiment arrêter ce service système ? Si tel est le cas, certaines fonctionnalités risquent de ne plus fonctionner correctement tant que vous n\'aurez pas éteint, puis rallumé votre téléphone."</string>
     <string name="language_settings" msgid="502219872342167227">"Langue et clavier"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Paramètres de langue et clavier"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Paramètres de langue"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Paramètres du clavier"</string>
     <string name="phone_language" msgid="1165758957501090679">"Sélectionner la langue"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Remplacement auto"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Mode de saisie"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gérer les options de saisie de texte"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Paramètres <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Paramètres du clavier intégré"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Clavier de l\'appareil"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Paramètres du clavier intégré"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Clavier intégré"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Paramètres du clavier physique intégré"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Développement"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Définir les options pour le développement de l\'application"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Débogage USB"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Ce service d\'accessibilité est susceptible de 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>. Utiliser ce service d\'accessibilité ?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Désactiver les services d\'accessibilité ?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Aucune application d\'accessibilité n\'a été trouvée."</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Aucune application d\'accessibilité n\'est installée."\n\n"Vous pouvez télécharger un lecteur d\'écran pour votre mobile depuis Android Market."\n\n"Cliquez sur OK pour installer le lecteur d\'écran."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Scripts d\'accessibilité"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Télécharger les scripts d\'accessibilité"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Autoriser les applications à télécharger des scripts d\'accessibilité à partir de Google"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Pour accéder au contenu de certaines applications, vous devrez éventuellement télécharger des scripts sur votre téléphone. Voulez-vous autoriser à Google à installer des scripts d\'accessibilité sur votre téléphone ?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Bouton MARCHE-ARRÊT"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Raccrocher pdt un appel"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Lors d\'un appel, utiliser le bouton MARCHE-ARRÊT pour raccrocher, sans désactiver l\'écran"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Batterie en charge"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Écran activé"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activé"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"WI-FI"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"En activité"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Signal du téléphone"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"Temps de fonctionnement du Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"Temps de fonctionnement du Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi/temps"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi à temps"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Infos détaillées sur l\'utilisation de la batterie"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Maintenir activé"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi en cours d\'exécution"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Téléphone"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Données envoyées"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Données reçues"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informations sur l\'application"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Paramètres des applications"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Paramètres d\'affichage"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Paramètres Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Paramètres Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Paramètres Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batterie utilisée par les appels vocaux"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Batterie utilisée lorsque le téléphone est inactif"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Autoriser l\'accès des applications aux certificats sécurisés et identifiants"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Saisir le mot de passe"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Saisissez le mot de passe du stockage des identifiants."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Installer depuis la carte SD"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Installer les certificats cryptés depuis la carte SD"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installation depuis USB"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installer depuis la carte SD"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Installer certificats cryptés depuis mémoire USB"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Installer les certificats cryptés depuis la carte SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Définir le mot de passe"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Définir/modifier le mot de passe de stockage des identifiants"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Effacer le stockage"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Sauvegarder et restaurer"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Données personnelles"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sauvegarder mes données"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Sauvegarder mes paramètres et autres données d\'application"</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Données d\'application de sauvegarde, mots de passe Wi-Fi et autres paramètres de serveurs Google"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurer automatiquement"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Restaurer les paramètres ou autres données sauvegardées lorsqu\'une application est réinstallée"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Restaurer les paramètres ou autres données sauvegardées lorsqu\'une application est réinstallée"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sauvegarder"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Voulez-vous vraiment arrêter de sauvegarder vos paramètres et vos données d\'application, et supprimer toutes les copies des serveurs Google ?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Voulez-vous vraiment arrêter de sauvegarder vos mots de passe Wi-Fi, vos favoris ainsi que vos données et paramètres d\'application, et supprimer toutes les copies des serveurs Google ?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Paramètres d\'administration du périphérique"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrateur du périphérique"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Désactiver"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualiser la liste"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignorer"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Suivant"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Analyse des réseaux..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Touchez l\'écran pour sélectionner un réseau"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Se connecter à un réseau existant"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Définissez la configuration du réseau"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Se connecter à un nouveau réseau"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Connexion en cours…"</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Connecté"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Passer à l\'étape suivante"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"La synchronisation rencontre des problèmes et sera bientôt rétablie."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Ajouter un compte"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Paramètres généraux"</string>
+    <string name="background_data" msgid="5779592891375473817">"Données en arrière-plan"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Synchronisation, envoi et réception de données à tout moment"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Avertissement"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"La désactivation des données en arrière-plan permet d\'économiser la batterie et de réduire l\'utilisation des données. Certaines applications peuvent utiliser la connexion des données en arrière-plan."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Synchronisation automatique"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Synchronisation automatique des données par les applications"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Gérer les comptes"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synchronisation activée"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchronisation désactivée"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Erreur de synchronisation"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 3b5801b..fa9e764 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statico"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Disattiva"</item>
     <item msgid="3165868966179561687">"Avviso"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7d51fb1..dd39a97 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"Sistema di identificazione contenuti"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Smonta scheda SD"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Formatta scheda SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Smonta archivio USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Smonta scheda SD"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Cancella archivio USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Cancella scheda SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Piccole"</string>
     <string name="medium_font" msgid="2068475425515133701">"Medie"</string>
     <string name="large_font" msgid="599055175160971446">"Grandi"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"Scheda SD"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Archivio USB"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Scheda SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Stato batteria:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Presa di corrente:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Scala batteria:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Scarica"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Sovratensione"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Errore sconosciuto"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Rilevabile"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Rilevabile per <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secondi..."</string>
@@ -120,7 +125,7 @@
     <string name="date_time_changeTime_text" msgid="7037437020000867740">"Modifica ora"</string>
     <string name="date_time_changeDate_text" msgid="5259762626498028057">"Data"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Seleziona fuso orario"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normale (<xliff:g id="DATE">%s</xliff:g>)\n"</string>
+    <string name="normal_date_format" msgid="1982904221918374153">"Normale (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Anteprima:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Dimensioni carattere:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Inizia <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Account:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Impostazioni proxy"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Imposta il proxy HTTP globale e gli elenchi di esclusioni"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Cancella"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Porta"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Nessun proxy per"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Ripristina predefinite"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Fine"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Nome host"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Attenzione"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Il nome host specificato non è valido."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"L\'elenco di esclusioni digitato non è nel formato corretto. Inserisci un elenco di domini esclusi separati da virgole."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Inserisci un valore nel campo Porta."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Il campo Porta deve essere vuoto se il campo Host è vuoto."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"La porta specificata non è valida."</string>
@@ -187,18 +187,23 @@
     <string name="band_mode_failed" msgid="1495968863884716379">"Non riuscita"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Riuscita"</string>
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Le modifiche saranno effettive alla riconnessione del cavo USB"</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Attiva archiviazione di massa USB"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Attiva archivio di massa USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Byte totali:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Nessuna scheda SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Archivio USB non montato"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Nessuna scheda SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Byte disponibili:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"Scheda SD in uso come dispositivo di archiviazione di massa"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"È ora possibile rimuovere la scheda SD"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"La scheda SD è stata rimossa quando ancora in uso."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Archivio USB usato come disp. di archiviaz. di massa"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Scheda SD in uso come dispositivo di archiviazione di massa"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"È possibile rimuovere l\'archivio USB"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"È ora possibile rimuovere la scheda SD"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Archivio USB rimosso quando ancora in uso."</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La scheda SD è stata rimossa quando ancora in uso."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Byte utilizzati:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Ricerca di media nella scheda SD..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"La scheda SD montata è di sola lettura"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Ricerca di media in archivio USB…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Ricerca di media nella scheda SD..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Arch. USB montato: sola lettura"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"La scheda SD montata è di sola lettura"</string>
+    <string name="skip_label" msgid="47510779345218297">"Salta"</string>
     <string name="next_label" msgid="4693520878012668114">"Avanti"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Lingua"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Seleziona attività"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Info batteria"</string>
     <string name="display_label" msgid="7403874003169865762">"Display"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Info telefono"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"Scheda SD"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Archivio USB"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Scheda SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Impostazioni proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Annulla"</string>
     <string name="settings_label" msgid="1626402585530130914">"Impostazioni"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Impostazioni"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Impostazioni"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modalità aereo"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Disattiva tutte le connessioni wireless"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleziona un operatore di rete"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e ora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Imposta data, ora, fuso orario e formati"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Data e ora automatiche"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilizza l\'ora fornita dalla rete"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utilizza l\'ora fornita dalla rete"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Fuso orario automatico"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utilizza il fuso orario fornito dalla rete"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilizza il fuso orario fornito dalla rete"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Usa formato 24 ore"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Imposta ora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleziona fuso orario"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordina per fuso orario"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Blocca dispositivo dopo timeout"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Regola il tempo che deve trascorrere prima che il dispositivo si blocchi automaticamente"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Posizione e protezione"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Impostazioni di posizione e protezione"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annulla"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Amministrazione dispositivo"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Seleziona gli amministratori dispositivo"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Aggiungi o rimuovi amministratori dispositivo"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Seleziona gli amministratori dispositivo"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Aggiungi o rimuovi amministratori dispositivo"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Attiva Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Impostazioni Bluetooth"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Come vivavoce"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e audio media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ricorda impostazioni"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Usa Near Field Communication per leggere e scambiare tag"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Attiva Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Impostazioni Wi-Fi"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connetti alla rete"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Elimina rete"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica rete"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Configurazione rete"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Inserisci il PIN del punto di accesso"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID rete"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Protezione"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identità"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identità anonima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Password"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Mostra password"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Impostazioni IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(invariati)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non specificati)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Memorizzata"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Disattivata"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuori portata"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Protetta con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Protetta con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Protetta con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS disponibile)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, protetta con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connetti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elimina"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Impostazioni IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Salva"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Annulla"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Digita un indirizzo IP valido."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Maschera di rete"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portatile"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portatile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> attivo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Errore hotspot Wi-Fi portatile"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stato"</string>
     <string name="device_status" msgid="607405385799807324">"Stato"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Numero di telefono, segnale ecc."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Smonta la scheda SD, visualizza spazio di archiviazione disponibile"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Archivio condiviso e sicuro"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Memoria"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Impostazioni di archiviazione"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Smonta l\'archivio USB, visualizza lo spazio di archiviazione disponibile"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Smonta la scheda SD, visualizza spazio di archiviazione disponibile"</string>
     <string name="status_number" msgid="5123197324870153205">"Il mio numero di telefono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versione PRL"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Non disponibile"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo di attività"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo di attività"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Archiviazione interna telefono"</string>
-    <string name="sd_memory" msgid="151871913888051515">"Scheda SD"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Archivio interno"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Archivio USB"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Scheda SD"</string>
     <string name="memory_available" msgid="418542433817289474">"Spazio disponibile"</string>
     <string name="memory_size" msgid="6629067715017232195">"Spazio totale"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Smonta scheda SD"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Smonta la scheda SD per una rimozione sicura"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Smonta archivio condiviso"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Smonta scheda SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Smonta archivio USB interno"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Smonta la scheda SD per poterla rimuovere in tutta sicurezza"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Attiva modalità PTP"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Il dispositivo viene visualizzato su USB come fotocamera PTP anziché come dispositivo MTP"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Inserisci una scheda SD da montare"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Installa scheda SD"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Installa la scheda SD"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Formatta scheda SD"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Formatta (cancella) la scheda SD"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Inserisci arch. USB da montare"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Inserisci una scheda SD da montare"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Monta archivio condiviso"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Installa scheda SD"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Monta archivio USB interno"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Installa la scheda SD"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Cancella archivio USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Cancella scheda SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Cancella i dati nell\'archivio USB interno del telefono, come musica e foto"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Cancella tutti i dati sulla scheda SD del telefono, come musica e foto"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Non disponibile"</string>
     <string name="read_only" msgid="6702420168629076340">" (Sola lettura)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Smonta scheda SD"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Se smonti la scheda SD, alcune applicazioni in uso si bloccheranno e potrebbero risultare non disponibili finché non rimonterai la scheda SD."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Smontaggio scheda SD non riuscito"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Impossibile smontare la scheda SD. Riprova più tardi."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"La scheda SD verrà smontata. Verifica lo stato nell\'area di notifica."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Smonta archivio USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Smonta scheda SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Se smonti l\'archivio USB, alcune applicazioni in uso si bloccheranno e potrebbero risultare non disponibili finché non rimonterai l\'archivio USB."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Se smonti la scheda SD, alcune applicazioni in uso si bloccheranno e potrebbero risultare non disponibili finché non rimonterai la scheda SD."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Archivio USB non smontato"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Smontaggio scheda SD non riuscito"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Impossibile smontare l\'archivio USB. Riprova più tardi."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Impossibile smontare la scheda SD. Riprova più tardi."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"L\'archivio USB verrà smontato."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"La scheda SD condiviso verrà smontata."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Smontaggio in corso"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Smontaggio in corso"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stato batteria"</string>
@@ -607,7 +639,7 @@
     <string name="apn_not_set" msgid="7422262558097875757">"&lt;Non impostato&gt;"</string>
     <string name="apn_name" msgid="4115580098369824123">"Nome"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
-    <string name="apn_http_proxy" msgid="1826885957243696354">"Proxy "</string>
+    <string name="apn_http_proxy" msgid="1826885957243696354">"Proxy"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"Porta"</string>
     <string name="apn_user" msgid="455637547356117761">"Nome utente"</string>
     <string name="apn_password" msgid="5412301994998250968">"Password"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Ripristino delle impostazioni APN predefinite completato"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ripristino dati di fabbrica"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Cancella tutti i dati sul telefono"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Questa operazione cancellerà tutti i dati del cellulare, compresi:"\n<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li>\n"Non cancellerà:"\n<li>"Attuale software del sistema e applicazioni integrate"</li>\n<li>"File della scheda SD, come musica o foto"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Questa operazione cancellerà tutti i dati dall\'"<b>"archivio interno"</b>" del telefono, compresi:"\n\n<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni di sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li>\n\n"Per cancellare tutti i dati su questo telefono, è necessario cancellare l\'"<b>"archivio USB"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Questa operazione cancellerà tutti i dati dall\'"<b>"archivio interno"</b>" del telefono, compresi:"\n\n<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni di sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li>\n\n"Per cancellare anche musica, foto e altri dati utente, è necessario cancellare la "<b>"scheda SD"</b>"."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Cancella archivio USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Cancella scheda SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Cancella i dati nell\'archivio USB interno del telefono, come musica o foto."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Cancella i dati sulla scheda SD del telefono, come musica o foto"</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Ripristina telefono"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Cancellare tutte le tue informazioni personali e qualsiasi applicazione scaricata? Sarà impossibile annullare questa azione."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Cancella tutto"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Inserisci la sequenza di sblocco"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Per confermare un ripristino del telefono occorre inserire la sequenza di sblocco."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Nessun ripristino eseguito perché il servizio System Clear non è disponibile."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Formatta scheda SD."</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Cancella tutti i dati sulla scheda SD"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Questa azione cancellerà TUTTI i dati della scheda SD del telefono, che andranno persi."</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"Formatta scheda SD"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Formattare la scheda SD, cancellando tutti i media? Questa azione è irreversibile."</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Cancella archivio USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Cancella scheda SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Cancella i dati nell\'arch. USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Cancella tutti i dati sulla scheda SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Questa azione cancellerà l\'archivio USB. "<b>"Tutti"</b>" i dati memorizzati al suo interno andranno persi."</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Questa azione cancellerà la scheda SD. "<b>"Tutti"</b>" i dati sulla scheda SD andranno persi."</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Cancella archivio USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Cancella scheda SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Cancellare l\'archivio USB, eliminando tutti i file memorizzati al suo interno? Questa azione è irreversibile."</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Cancellare la scheda SD, eliminando tutti i file memorizzati al suo interno? Questa azione è irreversibile."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Cancella tutto"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Inserisci la sequenza di sblocco"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Per confermare la formattazione della scheda SD devi inserire la sequenza di sblocco."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare l\'archivio USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare la scheda SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Impostazioni chiamate"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Imposta segreteria, deviazione chiamate, avviso di chiamata, ID chiamante"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering USB"</string>
@@ -670,7 +713,7 @@
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB collegata, seleziona per impostare tethering"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Con tethering"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Tethering non possibile quando è in uso la memorizzazione USB"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Tethering non possibile quando è in uso l\'archivio USB"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB non connessa"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Errore tethering USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering Bluetooth"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Errore tethering Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Tethering impossibile con più di <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivi"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Sarà annullato il tethering per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Impostazioni tethering Bluetooth"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Seleziona i dispositivi Bluetooth per il tethering"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Guida"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Reti mobili"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Imposta le opzioni per roaming, reti e APN"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizza GPS assistito"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizza il server per assistere il GPS (deseleziona per ridurre l\'utilizzo della rete)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizza il server per assistere il GPS (deseleziona per migliorare le prestazioni GPS)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Utilizza La mia posizione"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Info sul telefono"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Visualizza informazioni legali, stato del telefono, versione del software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informazioni legali"</string>
@@ -785,22 +831,28 @@
     <string name="unknown" msgid="1592123443519355854">"Sconosciuta"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordina per nome"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordina per dimensioni"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Mostra servizi in esecuzione"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Mostra processi nella cache"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestisci spazio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtra"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Seleziona opzioni di filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Tutte"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Scaricate"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"In esecuzione"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"Scheda SD"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Archivio USB"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Scheda SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Disattivato"</string>
     <string name="no_applications" msgid="5190227407135243904">"Nessuna applicazione."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Archivio interno"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Archivio USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Arch. scheda SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Ricalcolo dimensioni..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Elimina"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Tutti i dati dell\'applicazione verranno eliminati definitivamente, inclusi tutti i file, le impostazioni, gli account, i database e così via."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Annulla"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Applicazione non trovata"</string>
-    <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Impossibile trovare l\'applicazione \nnell\'elenco di applicazioni installate."</string>
+    <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Impossibile trovare l\'applicazione nell\'elenco di applicazioni installate."</string>
     <string name="clear_data_failed" msgid="581956197586913865">"Impossibile cancellare i dati dell\'applicazione."</string>
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Disinstalla aggiornamenti"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Disinstallare tutti gli aggiornamenti di questa applicazione di sistema Android?"</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"versione <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Sposta"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Sposta sul telefono"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Sposta su scheda SD"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Sposta in archivio USB"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Sposta su scheda SD"</string>
     <string name="moving" msgid="6431016143218876491">"Spostamento"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Spazio di archiviazione rimanente insufficiente."</string>
     <string name="does_not_exist" msgid="837163572898468245">"Applicazione inesistente."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Percorso di installazione"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Cambia il percorso preferito per l\'installazione di nuove applicazioni."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilizzo memoria"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Visualizza la memoria utilizzata dalle applicazioni"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servizi in esecuzione"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Visualizza e controlla i servizi attualmente in esecuzione"</string>
     <string name="service_restarting" msgid="2242747937372354306">"In fase di riavvio"</string>
+    <string name="cached" msgid="1059590879740175019">"Processo in background memorizzato nella cache"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Niente in esecuzione."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Avviato dall\'applicazione."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> disponibile"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> in uso"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> libera"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> usata"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> servizio"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Impostazioni"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Questo servizio è stato avviato dalla sua applicazione. L\'interruzione potrebbe bloccare l\'applicazione."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Questa applicazione non può essere interrotta in modo sicuro. Procedendo potresti perdere parte del lavoro corrente."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Questo è un vecchio processo di un\'applicazione che è stato mantenuto per migliorare la velocità in caso di necessità. In genere non c\'è motivo per arrestarlo."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: attualmente in uso. Tocca Impostazioni per controllare."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Il processo principale in uso."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Il servizio <xliff:g id="COMP_NAME">%1$s</xliff:g> è in uso."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Il provider <xliff:g id="COMP_NAME">%1$s</xliff:g> è in uso."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Interrompere il servizio di sistema?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Interrompere questo servizio di sistema? Tale operazione potrebbe comportare anomalie in alcune funzioni del telefono fino ai successivi spegnimento e riaccensione."</string>
     <string name="language_settings" msgid="502219872342167227">"Lingua e tastiera"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Impostazioni lingua e tastiera"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Impostazioni lingua"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Impostazioni tastiera"</string>
     <string name="phone_language" msgid="1165758957501090679">"Seleziona lingua"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Sostituzione automatica"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Metodo inserimento"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gestisci opzioni inserimento testo"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Impostazioni di <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Impostazioni tastiera sullo schermo"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Tastiera dispositivo"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Impostazioni tastiera incorporate"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Impostazioni tastiera incorporate"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Impostazioni tastiera fisica incorporate"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Sviluppo"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Imposta opzioni per lo sviluppo di applicazioni"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debug USB"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"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>. Utilizzare questo servizio di accesso facilitato?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Disattivare accesso facilitato?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nessuna applicazione di accesso facilitato trovata"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nessuna applicazione di accesso facilitato installata."\n\n"Puoi scaricare uno screen reader per il tuo dispositivo da Android Market."\n\n"Fai clic su OK per installare lo screen reader."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Script accessibilità"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Scarica script accessibilità"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Consentono di scaricare script di accessibilità da Google"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Alcune applicazioni possono chiedere a Google di scaricare sul telefono script che rendono i contenuti più accessibili. Consentire a Google di installare script di accessibilità sul telefono?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Pulsante di accensione"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Termina chiamata"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Durante una chiamata, la pressione del pulsante di accensione termina la chiamata invece di spegnere lo schermo"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"In carica"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Schermo acceso"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS attivo"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Attivo"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Segnale telefono"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Tempo di attività dispositivo"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"Tempo accensione Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"Tempo accensione Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Tempo accensione Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Tempo accensione Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Dettagli utilizzo batteria"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Dettagli di utilizzo"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU in primo piano"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantieni attivo"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi attivo"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Telefono"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dati inviati"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dati ricevuti"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Info applicazione"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Impostazioni applicazione"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Impostazioni display"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Impostazioni Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Impostazioni Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Impostazioni Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batteria utilizzata da chiamate vocali"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Utilizzo batteria quando il telefono è inattivo"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Consenti accesso applicazioni a certificati protezione e altre credenziali"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Inserisci password"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Inserisci la password dell\'archivio di credenziali."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Installa da scheda SD"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Installa certificati crittografati da scheda SD"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installa da archivio USB"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installa da scheda SD"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Installa certificati crittografati da arch. USB"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Installa certificati crittografati da scheda SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Imposta password"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Imposta o modifica la password dell\'archivio di credenziali"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Cancella archivio"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Backup e ripristino"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dati personali"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Backup dei miei dati"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Backup delle mie impostazioni e di altri dati delle applicazioni."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Effettua il backup di dati delle applicazioni, password Wi-Fi e altre impostazioni sui server di Google"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Ripristino automatico"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Se reinstallo un\'applicazione, ripristina le impostazioni o altri dati di backup."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Se reinstallo un\'applicazione, ripristina le impostazioni o altri dati di backup"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Copia di backup"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Interrompere il backup delle impostazioni e dei dati delle applicazioni e cancellare tutte le copie sui server Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Interrompere il backup delle password Wi-Fi, dei segnalibri, di altre impostazioni e dei dati delle applicazioni e cancellare tutte le copie sui server di Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Impostazioni di amministrazione dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Amministratore dispositivo"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Disattiva"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Aggiorna elenco"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignora"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Avanti"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Scansione reti in corso..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Tocca per selezionare la rete"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Connetti a rete esistente"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Inserisci configurazione di rete"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Connetti a nuova rete"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Connessione in corso..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Connesso"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Procedi al passaggio successivo"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"La sincronizzazione presenta dei problemi. L\'operazione verrà presto ripristinata."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Aggiungi account"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Impostaz. generali sincronizz."</string>
+    <string name="background_data" msgid="5779592891375473817">"Dati in background"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Sincron., invio e ricezione dati possibili in ogni momento"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Attenzione"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"La disattivazione dei dati in background aumenta la durata della batteria e riduce l\'utilizzo dei dati. Alcune applicazioni potrebbero utilizzare comunque la connessione dati in background."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Sincronizzazione autom."</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Le applicazioni sincronizzano i dati automaticamente"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Gestisci account"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sincronizz. attiva"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"La sincronizzazione non è attiva"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Errore sincronizz."</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 09e1d36..7680be4 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"静的"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"OFF"</item>
     <item msgid="3165868966179561687">"アラート"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f077b64..1292d35 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"SDカードのマウント解除"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"SDカードをフォーマット"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"USBストレージのマウント解除"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SDカードのマウント解除"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USBストレージ内データの消去"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"SDカード内データを消去"</string>
     <string name="small_font" msgid="2295331917424072635">"小"</string>
     <string name="medium_font" msgid="2068475425515133701">"中"</string>
     <string name="large_font" msgid="599055175160971446">"大"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"SDカード"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USBストレージ"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SDカード"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"充電状況"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"電源:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"電池の残量表示:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"残量なし"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"過電圧"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"不明なエラー"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"検出可能"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>秒間検出可能..."</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g>を開始"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"アカウント:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"プロキシ設定"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"グローバルHTTPプロキシと除外リストを設定する"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"消去"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"ポート"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"プロキシ不使用"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"初期設定に戻す"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"終了"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"ホスト名"</string>
     <string name="proxy_error" msgid="8926675299638611451">"注意"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"入力したホスト名は無効です。"</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"入力された除外リストの形式が正しくありません。除外するドメインをカンマ区切りリスト形式で入力してください。"</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"[ポート]フィールドに入力してください。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"[ホスト]フィールドが空の場合は、[ポート]フィールドも空にしてください。"</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"入力したポートは無効です。"</string>
@@ -189,16 +189,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"USBケーブルの再接続時に変更が有効になります"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USBマスストレージを有効にする"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"合計バイト数:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"SDカードがありません"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USBストレージがマウントされていません"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"SDカードがありません"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"利用可能バイト数:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"SDカードをマスストレージデバイスとして使用中"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"SDカードを安全に取り外せます"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"SDカードが使用中に取り外されました。"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USBストレージをマスストレージデバイスとして使用中"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SDカードをマスストレージデバイスとして使用中"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USBストレージを安全に取り外せます"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"SDカードを安全に取り外せます"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USBストレージが使用中に取り外されました"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SDカードが使用中に取り外されました。"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"使用済みバイト数:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"メディア用のSDカードをスキャン中..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"読み取り専用としてSDカードをマウントしました"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USBストレージをスキャン中..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"メディア用のSDカードをスキャン中..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USBストレージを読取専用でマウント済み"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"読み取り専用としてSDカードをマウントしました"</string>
+    <string name="skip_label" msgid="47510779345218297">"スキップ"</string>
     <string name="next_label" msgid="4693520878012668114">"次へ"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"言語"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"操作の選択"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"電池情報"</string>
     <string name="display_label" msgid="7403874003169865762">"ディスプレイ"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"携帯電話情報"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"SDカード"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USBストレージ"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SDカード"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"プロキシ設定"</string>
     <string name="cancel" msgid="6859253417269739139">"キャンセル"</string>
     <string name="settings_label" msgid="1626402585530130914">"設定"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"設定"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"機内モード"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"ワイヤレス接続をすべて無効にする"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"ネットワークオペレーターを選択します"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日付と時刻"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"日付、時刻、タイムゾーンの設定"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"日付と時刻の自動設定"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"ネットワークから提供された時刻を使用します"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"ネットワークから提供された時刻を使用します"</string>
+    <string name="zone_auto" msgid="334783869352026648">"タイムゾーンを自動設定"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ネットワークから提供されたタイムゾーンを使用します"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ネットワークから提供されたタイムゾーンを使用します"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24時間表示"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"時刻設定"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"タイムゾーンの選択"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"タイムゾーン順"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"タイムアウト後に端末をロック"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"端末を自動ロックするまでの時間を指定します"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"現在地情報とセキュリティ"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"位置情報とセキュリティの設定"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"キャンセル"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"デバイス管理"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"デバイス管理者を選択"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"デバイス管理者を追加または削除する"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"デバイス管理者を選択"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"デバイス管理者を追加または削除する"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"BluetoothをONにする"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth設定"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"スピーカーフォン"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"音楽とメディア"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"設定を保存"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"タグの読み取りと交換にNFCを使用"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-FiをONにする"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi設定"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ネットワークに接続"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ネットワークから切断"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ネットワークを変更"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"ネットワーク設定"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"アクセスポイントに記載のPINを入力してください"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"ネットワークSSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"セキュリティ"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名ID"</string>
     <string name="wifi_password" msgid="5948219759936151048">"パスワード"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"パスワードを表示する"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP設定"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"（変更なし）"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"（指定なし）"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"接続履歴あり"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"無効"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"圏外"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"<xliff:g id="WIFI_SECURITY">%1$s</xliff:g>で保護"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"<xliff:g id="WIFI_SECURITY">%1$s</xliff:g>で保護"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"<xliff:g id="WIFI_SECURITY">%1$s</xliff:g>で保護されています（WPS使用可）"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>、<xliff:g id="WIFI_SECURITY">%1$s</xliff:g>で保護"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"接続"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"切断"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP設定"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"保存"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"キャンセル"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"正しいIPアドレスを入力してください。"</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"ゲートウェイ"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"ネットマスク"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"ポータブルWi-Fiアクセスポイント"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"ポータブルアクセスポイント<xliff:g id="NETWORK_SSID">%1$s</xliff:g>が有効です"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"ポータブルWi-Fiアクセスポイントエラー"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"端末の状態"</string>
     <string name="device_status" msgid="607405385799807324">"端末の状態"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"電話番号、電波状態など"</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"SDカードの取り外し、空き容量の表示"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"共有ストレージとセキュアストレージ"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"ストレージ"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"ストレージの設定"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USBストレージのマウントを解除し、使用できるストレージを表示"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SDカードの取り外し、空き容量の表示"</string>
     <string name="status_number" msgid="5123197324870153205">"電話番号"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRLバージョン"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"不明"</string>
     <string name="status_up_time" msgid="7294859476816760399">"稼働時間"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"端末使用時間"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"端末内部メモリ"</string>
-    <string name="sd_memory" msgid="151871913888051515">"SDカード"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"内部ストレージ"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USBストレージ"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SDカード"</string>
     <string name="memory_available" msgid="418542433817289474">"空き容量"</string>
     <string name="memory_size" msgid="6629067715017232195">"合計容量"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"SDカードのマウント解除"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"SDカードを安全に取り外すためマウントを解除する"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"共有ストレージのマウントを解除"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"SDカードのマウント解除"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"内部USBストレージのマウント解除"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SDカードのマウント解除（安全な取り外し）"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"PTPモードを有効にする"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"USB接続時にMTPデバイスではなくPTPカメラデバイスとして認識されます"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"マウントするSDカードを挿入"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"SDカードをマウント"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"SDカードをマウント"</string>
-    <string name="sd_format" msgid="5448738337382712203">"SDカードをフォーマット"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"SDカードをフォーマット（消去）する"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"マウントするUSBストレージを挿入"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"マウントするSDカードを挿入"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"共有ストレージをマウント"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"SDカードをマウント"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"内部USBストレージのマウント"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"SDカードをマウント"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USBストレージ内データを消去"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"SDカード内データを消去"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"内部USBストレージ内の全データ（音楽、写真など）を消去します。"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"SDカード内の全データ（音楽、写真など）の消去"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"使用不可"</string>
     <string name="read_only" msgid="6702420168629076340">" （読み取り専用）"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"SDカードのマウント解除"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"SDカードのマウントを解除すると、使用中のアプリケーションの一部が停止し、SDカードを再マウントするまで使用できなくなる場合があります。"</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"SDカードのマウントを解除できません"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"SDカードのマウントを解除できません。しばらくしてからもう一度お試しください。"</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"SDカードのマウントを解除します。ステータスは通知エリアで確認してください。"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"USBストレージのマウント解除"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"SDカードのマウント解除"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"USBストレージのマウントを解除すると、使用中のアプリケーションの一部が停止し、USBストレージを再マウントするまで使用できなくなる場合があります。"</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"SDカードのマウントを解除すると、使用中のアプリケーションの一部が停止し、SDカードを再マウントするまで使用できなくなる場合があります。"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"USBストレージマウント解除失敗"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"SDカードのマウントを解除できません"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"USBストレージのマウントを解除できません。しばらくしてからもう一度お試しください。"</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"SDカードのマウントを解除できません。しばらくしてからもう一度お試しください。"</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USBストレージのマウントが解除されます。"</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SDカードのマウントが解除されます。"</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"マウント解除中"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"マウントを解除中"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"電池の状態:"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"APN設定をリセットしました"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"データの初期化"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"携帯電話内のすべてのデータを消去"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"この操作を行うと携帯のデータすべてが削除されます。消去されるデータには次のものがあります: "\n<li>"Googleアカウント"</li>\n<li>"システムやアプリケーションのデータと設定"</li>\n<li>"ダウンロードされたアプリケーション"</li>\n"この操作を行っても次のデータは削除されません: "\n<li>"既存のシステムソフトウェアやバンドルされているアプリケーション"</li>\n<li>"SDカードファイル（音楽や写真など）"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"この操作を行うと、携帯端末の"<b>"内部ストレージ"</b>"から次のデータがすべて消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムとアプリケーションのデータと設定"</li>\n<li>"ダウンロードされたアプリケーション"</li>\n\n"端末上のすべてのデータを削除するには、"<b>"USBストレージ"</b>"内のデータを消去する必要があります。"\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"この操作を行うと、携帯端末の"<b>"内部ストレージ"</b>"から次のデータがすべて消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムとアプリケーションのデータと設定"</li>\n<li>"ダウンロードされたアプリケーション"</li>\n\n"音楽や写真などユーザーデータも削除するには、"<b>"SDカード"</b>"内のデータを消去する必要があります。"\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USBストレージ内データの消去"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SDカード内データを消去"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"内部USBストレージ内の全データ（音楽、写真など）を消去します。"</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"SDカード内の全データ（音楽、写真など）を消去します。"</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"携帯電話をリセット"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"個人情報とダウンロードしたアプリケーションをすべて削除しますか？この操作を元に戻すことはできません。"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"すべて消去"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ロック解除パターンを入力してください"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"携帯電話をリセットするには、ロック解除パターンを入力する必要があります。"</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"System Clearサービスが利用できないため、リセットされませんでした。"</string>
-    <string name="media_format_title" msgid="4671276096695789895">"SDカードをフォーマットします。"</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"SDカードのすべてのデータを消去します"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"この操作を実行すると端末のSDカードが消去されます。カード内のすべてのデータが失われます。"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"SDカードをフォーマット"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"メディアをすべて消去してSDカードをフォーマットしますか？この操作は元に戻せません。"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USBストレージ内データを消去"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"SDカード内データを消去"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USBストレージ内の全データ消去"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"SDカードのすべてのデータを消去します"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"この操作を行うとUSBストレージ内のデータが消去されます。ストレージ内の"<b>"すべての"</b>"データが失われます。"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"この操作を行うとSDカード内のデータが消去されます。カード内の"<b>"すべての"</b>"データが失われます。"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"USBストレージ内データを消去"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"SDカード内データを消去"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"USBストレージをフォーマットして、保存されているすべてのファイルを削除しますか？この操作は元に戻せません。"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"SDカードをフォーマットして、保存されているすべてのファイルを削除しますか？この操作は元に戻せません。"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"すべて消去"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"ロック解除パターンを入力してください"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"ロック解除パターンを入力してSDカードのフォーマット実行を確認する必要があります。"</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"USBストレージ内のデータを消去してよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"SDカード内のデータを消去してよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"ボイスメール、着信転送、発信者番号など"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USBテザリング"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetoothテザリングのエラー"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"テザリングできるデバイスは<xliff:g id="MAXCONNECTION">%1$d</xliff:g>個までです"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>のテザリングを解除します。"</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Bluetoothテザリング設定"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"テザリングするBluetooth端末を選択する"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ヘルプ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"モバイルネットワーク"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"ローミング、ネットワーク、APN設定"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"A-GPSを使用"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"サーバーでGPSを補助します（OFFにするとネットワーク使用率が減少します）"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"サーバーでGPSを補助します（OFFにするとGPS性能が向上します）"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"現在地情報を使用"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"端末情報"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"端末情報、規約、バージョン情報"</string>
     <string name="legal_information" msgid="5769301644270604095">"法的情報"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"不明"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"名前順に表示する"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"サイズ順"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"実行中のサービスを表示"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"キャッシュしたプロセスを表示"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"容量を管理"</string>
     <string name="filter" msgid="2018011724373033887">"フィルタ"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"フィルタオプションを選択"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"すべて"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ダウンロード済み"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"実行中"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"SDカード上"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USBストレージ"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SDカード上"</string>
     <string name="disabled" msgid="9206776641295849915">"無効"</string>
     <string name="no_applications" msgid="5190227407135243904">"アプリケーションはありません"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"内部ストレージ"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USBストレージ"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SDカードストレージ"</string>
     <string name="recompute_size" msgid="7722567982831691718">"サイズを再計算中..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"削除"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"このアプリケーションのすべてのデータ（ファイル、設定、アカウント、データベースを含む）が完全に削除されます。"</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"バージョン<xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"移動"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"携帯端末に移動"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"SDカードに移動"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USBストレージに移動"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SDカードに移動"</string>
     <string name="moving" msgid="6431016143218876491">"移動中"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"ストレージの容量が不足しています。"</string>
     <string name="does_not_exist" msgid="837163572898468245">"そのアプリケーションは存在しません."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"優先インストール先"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"新しいアプリケーションの優先インストール先を変更する"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"ストレージ使用状況"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"アプリケーションのストレージ使用状況を表示する"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"実行中のサービス"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"現在実行中のサービスを表示して制御する"</string>
     <string name="service_restarting" msgid="2242747937372354306">"再起動中"</string>
+    <string name="cached" msgid="1059590879740175019">"キャッシュしたバックグラウンドプロセス"</string>
     <string name="no_running_services" msgid="2059536495597645347">"実行中のサービスはありません"</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"アプリケーションによって起動されたサービス。"</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"空きメモリ: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"使用メモリ: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g>空き"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g>使用中"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>のサービス"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"設定"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"このサービスはアプリケーションによって起動されました。停止するとアプリケーションに問題が発生するおそれがあります。"</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"このアプリケーションを安全に停止できません。停止すると現在の作業が一部失われるおそれがあります。"</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"以前のアプリケーションのプロセスです。再度必要になった場合に備えて速度向上のために残されています。通常は停止する必要はありません。"</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: 現在使用中です。管理するには[設定]をタップしてください。"</string>
     <string name="main_running_process_description" msgid="929204645380391397">"使用中のメインプロセスです。"</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"サービス<xliff:g id="COMP_NAME">%1$s</xliff:g>は使用中です。"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"プロバイダ<xliff:g id="COMP_NAME">%1$s</xliff:g>は使用中です。"</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"システムサービスを停止しますか？"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"このシステムサービスを停止してよろしいですか？停止すると、電源を一旦OFFにして再度ONにするまで、端末の一部の機能が正常に動作しなくなる場合があります。"</string>
     <string name="language_settings" msgid="502219872342167227">"言語とキーボード"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"言語とキーボードの設定"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"言語設定"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"キーボード設定"</string>
     <string name="phone_language" msgid="1165758957501090679">"言語を選択"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"自動修正"</string>
@@ -870,15 +929,15 @@
     <string name="show_password" msgid="2198798062604049206">"パスワードを表示"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"パスワード入力時に文字を表示する"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"この入力方法を選択すると、入力する全文字列の収集をアプリケーション（<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>）に許可することになります。これにはパスワードやクレジットカード番号などの個人情報も含まれます。この入力方法を使用しますか？"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"ユーザー辞書"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"ユーザー辞書"</string>
+    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"単語リスト"</string>
+    <string name="user_dict_settings_title" msgid="8357027437499042191">"単語リスト"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"追加"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"辞書に追加"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"語句の編集"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"編集"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"削除"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"ユーザー辞書に登録がありません。MENUから単語を登録してください。"</string>
+    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"単語リストに登録がありません。MENUから単語を登録してください。"</string>
     <string name="testing" msgid="6584352735303604146">"テスト中"</string>
     <string name="testing_phone_info" msgid="8656693364332840056">"携帯電話情報"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"電池情報"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"入力方法"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"テキスト入力オプションを管理"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>の設定"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"画面キーボードの設定"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"端末内蔵キーボード"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"端末内蔵キーボードの設定"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"端末内蔵キーボード"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"端末内蔵物理キーボードの設定"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"開発"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"アプリケーション開発オプション"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USBデバッグ"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"このユーザー補助サービスを選択すると、入力する全テキストの収集をアプリケーション（<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>）に許可することになります。これにはクレジットカード番号などの個人情報（パスワードを除く）も含まれます。また、ユーザーインターフェースでのやり取りも記録されます。このユーザー補助サービスを使用しますか？"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"ユーザー補助サービスを無効にしますか？"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"ユーザー補助アプリケーションが見つかりません"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"ユーザー補助アプリケーションをインストールしていません。"\n\n"Androidマーケットから携帯端末用のスクリーンリーダーをダウンロードできます。"\n\n"スクリーンリーダーをインストールするには[OK]をタップします。"</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"ユーザー補助スクリプト"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"ユーザー補助スクリプトをダウンロードする"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"ユーザー補助スクリプトをGoogleからダウンロードすることをアプリケーションに許可する"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"一部のアプリケーションでは、アプリケーションコンテンツへのアクセスについてユーザーを補助するスクリプトを端末にダウンロードするよう求められることがあります。端末上にユーザー補助スクリプトをインストールすることを許可してもよろしいですか？"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"電源ボタン"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"電源ボタンで通話を終了する"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"画面をOFFにするのではなく電源ボタンを押して通話を終了する"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"充電中"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"画面点灯"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPSがON"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"スリープなし"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"電波状態"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"端末使用時間"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"WiFiをONにしている時間"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"BluetoothをONにしている時間"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-FiをONにしている時間"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-FiをONにしている時間"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"電池使用量の詳細"</string>
     <string name="details_subtitle" msgid="32593908269911734">"詳細を使用"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUフォアグラウンド"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"スリープモードにしない"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi使用"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"電話"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"送信されたデータ"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"受信したデータ"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"アプリケーション情報"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"アプリケーションの設定"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"画面設定"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"WiFiの設定"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi設定"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetoothの設定"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"通話の電池使用量"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"アイドル時の電池使用量"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"安全な証明書と他の認証情報へのアクセスをアプリケーションに許可する"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"パスワードを入力する"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"認証情報ストレージパスワードを入力します。"</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"SDカードからインストール"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"暗号化された証明書をSDカードからインストールする"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"USBストレージからのインストール"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"SDカードからインストール"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"USBストレージから暗号化された証明書をインストール"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"暗号化された証明書をSDカードからインストールする"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"パスワードの設定"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"認証情報ストレージパスワードを設定または変更する"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"ストレージの消去"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"バックアップと復元"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"個人データ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"データのバックアップ"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"設定やその他のアプリケーションデータをバックアップします。"</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"アプリケーションデータ、Wi-Fiパスワード、その他の設定をGoogleサーバーにバックアップします。"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自動復元"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"バックアップ済みの設定やその他のデータをアプリケーションの再インストール時に復元します。"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"バックアップ済みの設定やその他のデータをアプリケーションの再インストール時に復元します"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"バックアップ"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"設定とアプリケーションデータのバックアップを停止し、Googleサーバー上のすべてのコピーを消去してもよろしいですか？"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Wi-Fiパスワード、ブックマーク、その他の設定とアプリケーションデータのバックアップを停止し、Googleサーバー上のすべてのコピーを消去してよろしいですか？"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"デバイス管理の設定"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"デバイス管理者"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"無効にする"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"リストを更新"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"スキップ"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"次へ"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"ネットワークをスキャン中..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"タップしてネットワークを選択します"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"既存ネットワークに接続"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"ネットワーク設定を入力してください"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"新しいネットワークに接続"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"接続中..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"接続されました"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"次の手順に進む"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"現在同期で問題が発生しています。しばらくお待ちください。"</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"アカウントを追加"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"同期の全般設定"</string>
+    <string name="background_data" msgid="5779592891375473817">"バックグラウンドデータ"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"アプリケーションがデータをいつでも同期、送信、受信できるようにする"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"注意"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"バックグラウンドデータを無効にすると、データの使用量が減るため電池を節約できます。一部のアプリケーションでは引き続きバックグラウンドデータの接続を使用します。"</string>
     <string name="sync_automatically" msgid="7558810110682562376">"自動同期"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"アプリケーションが自動的にデータを同期する"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"アカウントを管理"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"同期ON"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"同期OFF"</string>
+    <string name="sync_error" msgid="5060969083117872149">"同期エラー"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index f70c7bb..b01f29c 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"고정"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"사용 안함"</item>
     <item msgid="3165868966179561687">"알리미"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e513e85..a8b5eae 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"SD 카드 마운트 해제"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"SD 카드 포맷"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"USB 저장소 마운트 해제"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD 카드 마운트 해제"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB 저장소 지우기"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD 카드 지우기"</string>
     <string name="small_font" msgid="2295331917424072635">"작게"</string>
     <string name="medium_font" msgid="2068475425515133701">"보통"</string>
     <string name="large_font" msgid="599055175160971446">"크게"</string>
     <string name="font_size_save" msgid="3450855718056759095">"확인"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"SD 카드"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB 저장소"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD 카드"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"배터리 상태:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"전원 플러그:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"배터리 충전 상태:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"방전됨"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"과전압"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"알 수 없는 오류"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"검색 가능"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>초 동안 검색 가능..."</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> 시작"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"계정:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"프록시 설정"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"전체 HTTP 프록시 및 제외목록 설정"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"지우기"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"포트"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"프록시 없음"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"기본값 복원"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"완료"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"호스트 이름"</string>
     <string name="proxy_error" msgid="8926675299638611451">"주의"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"확인"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"입력한 호스트 이름이 잘못되었습니다."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"입력한 제외목록의 형식이 올바르지 않습니다. 제외된 도메인의 쉼표로 구분된 목록을 입력하시기 바랍니다."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"포트 필드를 입력해야 합니다."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"호스트 필드가 비어 있는 경우 포트 필드에 입력하면 안 됩니다."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"입력한 포트가 올바르지 않습니다."</string>
@@ -188,17 +188,22 @@
     <string name="band_mode_succeeded" msgid="2701016190055887575">"성공"</string>
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"변경사항을 적용하려면 USB 케이블을 다시 연결해야 합니다."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB 대용량 저장소 사용"</string>
-    <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"총 바이트 수: "</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"SD 카드 없음"</string>
+    <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"총 바이트 수:"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB 저장소가 마운트되지 않았습니다."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"SD 카드 없음"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"사용 가능한 바이트:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"SD 카드를 대용량 저장장치로 사용 중"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"이제 SD 카드를 안전하게 제거할 수 있습니다."</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"SD 카드를 사용하는 중에 분리되었습니다."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB 저장소를 대용량 저장장치로 사용 중"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD 카드를 대용량 저장장치로 사용 중"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"이제 USB 저장소를 안전하게 제거할 수 있습니다."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"이제 SD 카드를 안전하게 제거할 수 있습니다."</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB 저장소가 사용 중에 분리되었습니다."</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD 카드를 사용하는 중에 분리되었습니다."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"사용 바이트 수:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"SD 카드에서 미디어 검색 중..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"SD 카드가 읽기전용으로 마운트됨"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB 저장소에서 미디어 검색 중…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD 카드에서 미디어 검색 중..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB 저장소가 읽기전용으로 마운트됨"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD 카드가 읽기전용으로 마운트됨"</string>
+    <string name="skip_label" msgid="47510779345218297">"건너뛰기"</string>
     <string name="next_label" msgid="4693520878012668114">"다음"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"언어"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"활동 선택"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"배터리 정보"</string>
     <string name="display_label" msgid="7403874003169865762">"디스플레이"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"휴대전화 정보"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"SD 카드"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB 저장소"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD 카드"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"프록시 설정"</string>
     <string name="cancel" msgid="6859253417269739139">"취소"</string>
     <string name="settings_label" msgid="1626402585530130914">"설정"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"설정"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"설정"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"비행기 모드"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"모든 무선 연결 사용 안함"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"네트워크 운영자 선택"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"날짜 및 시간"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"날짜, 시간, 표준시간대 및 형식 설정"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"날짜/시간 자동설정"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"인터넷 시간 사용"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"인터넷 시간 사용"</string>
+    <string name="zone_auto" msgid="334783869352026648">"시간대 자동설정"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"인터넷 시간대 사용"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"인터넷 시간대 사용"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24시간 형식 사용"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"시간 설정"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"표준시간대 선택"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"시간대별 정렬"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"시간 초과 후 기기 잠금"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"기기 자동 잠김 간격 조정"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"위치 및 보안"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"위치 및 보안 설정"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"확인"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"취소"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"기기 관리"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"기기 관리자 선택"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"기기 관리자 추가 또는 삭제"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"기기 관리자 선택"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"기기 관리자 추가 또는 삭제"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth 켜기"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth 설정"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"스피커폰으로 사용"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"음악 및 미디어"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"설정 기억"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"NFC(Near Field Communication)를 사용하여 태그를 읽고 교환합니다."</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi 켜기"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi 설정"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"네트워크 연결"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"네트워크 저장 안함"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"네트워크 수정"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"네트워크 설정"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"액세스 포인트에서 PIN 입력"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"네트워크 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"보안"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"익명 ID"</string>
     <string name="wifi_password" msgid="5948219759936151048">"비밀번호"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"비밀번호 표시"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP 설정"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(변경 안함)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(지정되지 않음)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"저장됨"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"사용 안함"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"범위 내에 없음"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"<xliff:g id="WIFI_SECURITY">%1$s</xliff:g>(으)로 보안"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"<xliff:g id="WIFI_SECURITY">%1$s</xliff:g>(으)로 보안"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"<xliff:g id="WIFI_SECURITY">%1$s</xliff:g>(으)로 보안(WPS 사용가능)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>(으)로 보안"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"연결"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"저장 안함"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP 설정"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"저장"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"취소"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"올바른 IP 주소를 입력하세요."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"게이트웨이"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"넷마스크"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"휴대용 Wi-Fi 핫스팟"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"휴대용 핫스팟 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 사용"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"휴대용 Wi-Fi 핫스팟 오류"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"상태"</string>
     <string name="device_status" msgid="607405385799807324">"상태"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"전화번호, 신호 등"</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"SD 카드 마운트 해제, 사용 가능한 저장공간 보기"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"공유 및 보안 저장소 저장장치"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"저장소"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"저장소 설정"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB 저장소를 마운트 해제하고 사용 가능한 저장공간을 봅니다."</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD 카드 마운트 해제, 사용 가능한 저장공간 보기"</string>
     <string name="status_number" msgid="5123197324870153205">"내 휴대전화 번호"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL 버전"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"사용할 수 없음"</string>
     <string name="status_up_time" msgid="7294859476816760399">"가동 시간"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"무중단 가동 시간"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"휴대전화 내부 저장공간"</string>
-    <string name="sd_memory" msgid="151871913888051515">"SD 카드"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"내부 저장소"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 저장소"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD 카드"</string>
     <string name="memory_available" msgid="418542433817289474">"사용 가능한 저장공간"</string>
     <string name="memory_size" msgid="6629067715017232195">"총 공간"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"SD 카드 마운트 해제"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"안전 제거를 위해 SD 카드 마운트 해제"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"공유 저장장치 마운트 해제"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"SD 카드 마운트 해제"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"내부 USB 저장소 마운트 해제"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD 카드를 마운트 해제하여 안전하게 제거"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"PTP 모드 사용"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"USB에 MTP 기기가 아닌 PTP 카메라 기기로 표시됩니다."</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"마운트할 SD 카드 삽입"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"SD 카드 마운트"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"SD 카드 마운트"</string>
-    <string name="sd_format" msgid="5448738337382712203">"SD 카드 포맷"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"SD 카드 포맷(지우기)"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"마운트할 USB 저장소 삽입"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"마운트할 SD 카드 삽입"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"공유 저장장치 마운트"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"SD 카드 마운트"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"내부 USB 저장소 마운트"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"SD 카드 마운트"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB 저장소 지우기"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"SD 카드 지우기"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"휴대전화의 내부 USB 저장소에 있는 모든 데이터(예: 음악 및 사진)를 지웁니다."</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"휴대전화의 SD 카드에 있는 모든 데이터(예: 음악 및 사진) 지우기"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"사용할 수 없음"</string>
     <string name="read_only" msgid="6702420168629076340">" (읽기전용)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"SD 카드 마운트 해제"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"SD 카드를 마운트 해제하면 사용 중인 일부 애플리케이션이 중지되고 SD 카드를 다시 마운트할 때까지 사용할 수 없게 됩니다."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"SD 카드 마운트 해제 실패\n"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"SD 카드를 마운트 해제할 수 없습니다. 나중에 다시 시도하세요."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"SD 카드가 마운트 해제됩니다. 알림 영역에서 상태를 확인하세요."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"USB 저장소 마운트 해제"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"SD 카드 마운트 해제"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"USB 저장소를 마운트 해제하면 사용 중인 일부 애플리케이션이 중지되고 USB 저장소를 다시 마운트할 때까지 사용할 수 없게 됩니다."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"SD 카드를 마운트 해제하면 사용 중인 일부 애플리케이션이 중지되고 SD 카드를 다시 마운트할 때까지 사용할 수 없게 됩니다."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"USB 저장소 마운트 해제 실패"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"SD 카드 마운트 해제 실패"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"USB 저장소를 마운트 해제할 수 없습니다. 다시 시도하세요."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"SD 카드를 마운트 해제할 수 없습니다. 나중에 다시 시도하세요."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB 저장소를 마운트 해제합니다."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD 카드가 마운트 해제됩니다."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"마운트 해제 중"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"마운트 해제 중"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"배터리 상태"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"기본 APN 설정을 재설정했습니다."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"기본값 데이터 재설정"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"휴대전화의 모든 데이터 지우기"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"휴대전화에서 다음 모든 데이터가 지워집니다."\n<li>"Google 계정"</li>\n<li>"시스템과 애플리케이션 데이터 및 설정"</li>\n<li>"다운로드한 애플리케이션"</li>\n"삭제되지 않는 항목은 다음과 같습니다. "\n<li>"현재 시스템 소프트웨어 및 번들 애플리케이션"</li>\n<li>"음악 또는 사진 등의 SD 카드 파일"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"휴대전화의 "<b>"내부 저장소"</b>"에서 "\n\n<li>"Google 계정"</li>\n<li>"시스템과 애플리케이션의 데이터 및 설정"</li>\n<li>"다운로드한 애플리케이션"</li>\n\n" 등을 비롯한 모든 데이터가 지워집니다. 휴대전화의 모든 데이터를 지우려면 "<b>"USB 저장소"</b>"를 지워야 합니다."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"휴대전화의 "<b>"내부 저장소"</b>"에서 "\n\n<li>"Google 계정"</li>\n<li>"시스템과 애플리케이션의 데이터 및 설정"</li>\n<li>"다운로드한 애플리케이션"</li>\n\n" 등을 비롯한 모든 데이터가 지워집니다. 음악, 사진 및 기타 사용자 데이터도 지우려면 "<b>"SD 카드"</b>"를 지워야 합니다."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB 저장소 지우기"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD 카드 지우기"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"휴대전화기의 내부 USB 저장소에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"휴대전화의 SD 카드에 있는 모든 데이터(예: 음악 및 사진)를 지웁니다."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"휴대전화 재설정"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"모든 개인 정보와 다운로드한 애플리케이션을 삭제하시겠습니까? 수행한 작업은 취소할 수 없습니다."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"모두 지우기"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"잠금해제 패턴을 그리세요."</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"휴대전화 재설정을 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"시스템 지우기 서비스를 사용할 수 없어 재설정을 수행하지 못했습니다."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"SD 카드 포맷."</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"SD 카드의 모든 데이터 지우기"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"이 작업을 수행하면 휴대전화의 SD 카드에 저장된 모든 데이터를 잃게 됩니다."</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"SD 카드 포맷"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"SD 카드를 포맷하여 모든 미디어를 지우시겠습니까? 수행한 작업은 취소할 수 없습니다."</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB 저장소 지우기"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"SD 카드 지우기"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB 저장소의 모든 데이터 지우기"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"SD 카드의 모든 데이터 지우기"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"이 작업을 수행하면 USB 저장소가 지워집니다. 저장된 "<b>"모든"</b>" 데이터가 삭제되니 주의하세요."</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"이 작업을 수행하면 SD 카드가 지워집니다. 카드에 저장된 "<b>"모든"</b>" 데이터가 삭제되니 주의하세요."</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"USB 저장소 지우기"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"SD 카드 지우기"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"USB 저장소를 지워서 저장된 모든 파일을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"SD 카드를 지워서 저장된 모든 파일을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"모두 지우기"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"잠금해제 패턴을 그리세요."</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"SD 카드 포맷을 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"USB 저장소를 지우려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"SD 카드를 지우려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"통화 설정"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"음성메일, 착신전환, 통화중 대기, 발신자 번호 설정"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 테더링"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"블루투스 테더링 오류"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>개의 기기까지만 테더링 사용 가능"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 기기의 테더링이 끊깁니다."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"블루투스 테더링 설정"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"테더링할 블루투스 기기 선택"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"도움말"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"모바일 네트워크"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"로밍, 네트워크, APN에 대한 옵션 설정"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"GPS 도우미 사용"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"서버를 사용하여 GPS 보조(네트워크 사용량을 줄이려면 선택 취소)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"서버를 사용하여 GPS 보조(GPS 성능을 개선하려면 선택 취소)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"내 위치 사용"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"휴대전화 정보"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"법률 정보, 휴대전화 상태, 소프트웨어 버전 보기"</string>
     <string name="legal_information" msgid="5769301644270604095">"법률정보"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"알 수 없음"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"이름별 정렬"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"크기별 정렬"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"실행 중인 서비스 표시"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"캐시된 프로세스 표시"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"공간 관리"</string>
     <string name="filter" msgid="2018011724373033887">"필터"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"필터 옵션 선택"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"모두"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"다운로드됨"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"실행 중"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"SD 카드"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 저장소"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD 카드"</string>
     <string name="disabled" msgid="9206776641295849915">"사용 안함"</string>
     <string name="no_applications" msgid="5190227407135243904">"애플리케이션이 없습니다."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"내부 저장소"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 저장소"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD 카드 저장소"</string>
     <string name="recompute_size" msgid="7722567982831691718">"크기 다시 계산 중..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"삭제"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"애플리케이션의 전체 데이터가 영구적으로 삭제됩니다. 여기에는 모든 파일, 설정, 계정, 데이터베이스 등이 포함됩니다."</string>
@@ -813,13 +865,14 @@
     <string name="version_text" msgid="9189073826278676425">"버전 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"이동"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"휴대전화로 이동"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"SD 카드로 이동"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB 저장소로 이동"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD 카드로 이동"</string>
     <string name="moving" msgid="6431016143218876491">"이동하는 중"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"남은 저장공간이 부족합니다."</string>
     <string name="does_not_exist" msgid="837163572898468245">"애플리케이션이 없습니다."</string>
     <string name="app_forward_locked" msgid="5747805144210389585">"복제 방지된 애플리케이션입니다."</string>
     <string name="invalid_location" msgid="4934491353200240499">"지정된 설치 위치가 잘못되었습니다."</string>
-    <string name="system_package" msgid="1030561474413022831">"외부 미디어에 시스템 업데이트를 설치할 수 없습니다. "</string>
+    <string name="system_package" msgid="1030561474413022831">"외부 미디어에 시스템 업데이트를 설치할 수 없습니다."</string>
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"강제 종료"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"강제로 애플리케이션을 종료하면 예기치 않은 오류가 발생할 수 있습니다. 계속하시겠습니까?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"애플리케이션 이동"</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"기본 설치 위치"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"새 애플리케이션에 대한 기본 설치 위치를 변경합니다."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"저장공간 사용량"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"애플리케이션에서 사용한 저장소 보기"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"실행 중인 서비스"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"현재 실행 중인 서비스 보기 및 제어"</string>
     <string name="service_restarting" msgid="2242747937372354306">"다시 시작하는 중"</string>
+    <string name="cached" msgid="1059590879740175019">"백그라운드 프로세스 캐시됨"</string>
     <string name="no_running_services" msgid="2059536495597645347">"실행 중인 서비스가 없습니다."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"애플리케이션에서 시작했습니다."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> 사용 가능"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> 사용 중"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> 무료"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> 사용됨"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"프로세스 <xliff:g id="NUMPROCESS">%1$d</xliff:g>개 및 서비스 <xliff:g id="NUMSERVICES">%2$d</xliff:g>개"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"설정"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"이 서비스는 해당 애플리케이션에서 시작했습니다. 중지할 경우 애플리케이션에 장애가 발생할 수 있습니다."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"이 애플리케이션을 안전하게 중지할 수 없습니다. 중지할 경우 현재 작업의 일부가 유실될 수 있습니다."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"향후에 다시 필요할 경우 빠르게 실행하기 위해 저장해두는 백그라운드 프로세스로서 일반적으로 중지할 필요는 없습니다."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>이(가) 현재 사용 중입니다. 조정하려면 설정을 터치하세요."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"사용 중인 기본 프로세스입니다."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"서비스 <xliff:g id="COMP_NAME">%1$s</xliff:g>이(가) 사용 중입니다."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"제공업체(<xliff:g id="COMP_NAME">%1$s</xliff:g>)를 사용 중입니다."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"시스템 서비스를 중지하시겠습니까?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"이 시스템 서비스를 중지하시겠습니까? 중지하면 휴대전화의 일부 기능이 올바르게 작동되지 않을 수 있으며 전원을 껐다 켜야 합니다."</string>
     <string name="language_settings" msgid="502219872342167227">"언어 및 키보드"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"언어 및 키보드 설정"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"언어 설정"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"키보드 설정"</string>
     <string name="phone_language" msgid="1165758957501090679">"언어 선택"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"자동 바꾸기"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"입력 방법"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"텍스트 입력 옵션 관리"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 설정"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"화면 키보드 설정"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"기기 키보드"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"내장 키보드 설정"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"내장 키보드"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"내장 물리적 키보드 설정"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"개발"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"애플리케이션 개발 옵션 설정"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 디버깅"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"접근성 서비스는 비밀번호를 제외한 개인 데이터 신용카드 번호 등과 같이 사용자가 입력한 모든 텍스트를 수집할 수 있습니다. 또한 사용자 인터페이스 상호 작용을 기록할 수도 있습니다. 이 서비스는 <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> 애플리케이션에서 제공합니다. 접근성 서비스를 사용하시겠습니까?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"접근성 서비스를 사용 중지하시겠습니까?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"애플리케이션에 대한 접근성 없음"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"설치된 접근성 관련 애플리케이션이 없습니다."\n\n"Android 마켓에서 기기에 대한 스크린 리더를 다운로드할 수 있습니다."\n\n"스크린 리더를 설치하려면 확인을 클릭합니다."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"접근성 스크립트"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"접근성 스크립트 다운로드"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"애플리케이션이 Google에서 접근성 스크립트를 다운로드하도록 허용"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"일부 애플리케이션은 휴대전화에 해당 콘텐츠에 대한 접근성을 높이는 스크립트를 다운로드하도록 Google에 요청할 수 있습니다. Google이 휴대전화에 접근성 스크립트를 설치하도록 하시겠습니까?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"전원 버튼"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"전원 버튼으로 통화 종료"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"전화를 거는 동안 전원 버튼을 누르면 화면이 꺼지지 않고 통화가 종료"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"충전 중"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"화면 켜짐"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS 사용"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"켜짐"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"신호 강도"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"장치 무중단 가동 시간"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"WiFi 사용 시간"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"WiFi 사용 시간"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi 사용 시간"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi 사용 시간"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"배터리 사용 세부정보"</string>
     <string name="details_subtitle" msgid="32593908269911734">"사용 세부정보"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 포그라운드"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"켜진 상태로 유지"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi 실행 중"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"휴대전화"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"보낸 데이터"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"수신된 데이터"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"애플리케이션 정보"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"애플리케이션 설정"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"디스플레이 설정"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"WiFi 설정"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi 설정"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth 설정"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"음성 통화에서 배터리 사용"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"휴대전화가 유휴 상태일 때 배터리 사용"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"애플리케이션이 보안 인증서 및 다른 자격증명에 액세스 허용"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"비밀번호 입력"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"자격증명 저장소 비밀번호를 입력하세요."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"SD 카드에서 설치"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"SD 카드에서 암호화된 인증서 설치"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"USB 저장소에서 설치"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"SD 카드에서 설치"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"USB 저장소에서 암호화된 인증서 설치"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"SD 카드에서 암호화된 인증서 설치"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"비밀번호 설정"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"자격증명 저장소 비밀번호를 설정하거나 변경"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"저장소 삭제"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"백업 및 복원"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"개인 데이터"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"내 데이터 백업"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"내 설정 및 다른 애플리케이션 데이터를 백업합니다."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"애플리케이션 데이터, Wi-Fi 비밀번호 및 기타 설정을 Google 서버에 백업"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"자동 복원"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"애플리케이션을 다시 설치하면 백업한 설정이나 다른 데이터를 복원합니다."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"애플리케이션을 다시 설치하면 백업한 설정이나 다른 데이터를 복원합니다"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"백업"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"설정 및 애플리케이션 데이터 백업을 중지하고 Google 서버에 있는 모든 사본을 삭제하시겠습니까?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Wi-Fi 비밀번호, 북마크, 기타 설정 및 애플리케이션 데이터 백업을 중지하고 Google 서버에 있는 모든 사본을 지우시겠습니까?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"기기 관리 설정"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"기기 관리자"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"비활성화"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"목록 새로고침"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"건너뛰기"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"다음"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"네트워크 검색 중…"</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"네트워크를 선택하려면 터치합니다."</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"기존 네트워크에 연결"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"네트워크 구성 입력"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"새 네트워크에 연결"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"연결 중..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"연결됨"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"다음 단계로 넘어가기"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"현재 동기화에 문제가 발생했습니다. 잠시 후에 다시 실행됩니다."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"계정 추가"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"일반 동기화 설정"</string>
+    <string name="background_data" msgid="5779592891375473817">"백그라운드 데이터"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"애플리케이션이 언제든지 데이터를 동기화하고 보내고 받을 수 있음"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"주의"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"백그라운드 데이터를 사용하지 않도록 설정하면 배터리 수명이 늘어나고 데이터 사용량이 줄어듭니다. 일부 애플리케이션에서는 백그라운드 데이터 연결을 계속 사용할 수도 있습니다."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"자동 동기화"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"애플리케이션이 데이터를 자동으로 동기화"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"계정 관리"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"동기화 사용 중"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"동기화 사용 안함"</string>
+    <string name="sync_error" msgid="5060969083117872149">"동기화 오류"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 4063c0e..8d44609 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAP2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statisk"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Av"</item>
     <item msgid="3165868966179561687">"Varsel"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index af43ee3..79c7744 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Avmonter minnekort"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Formater minnekort"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Koble fra USB-lagring"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Avmonter minnekort"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Slett USB-lagring"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Slett SD-kort"</string>
     <string name="small_font" msgid="2295331917424072635">"Liten"</string>
     <string name="medium_font" msgid="2068475425515133701">"Middels"</string>
     <string name="large_font" msgid="599055175160971446">"Stor"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"Minnekort"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB-lagring"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Minnekort"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Batteristatus:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Strømplugg:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Batteriskala:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Dødt"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Overspenning"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ukjent feil"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Synlig"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Synlig i <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunder…"</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Start <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Konto:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Mellomtjenerinnstillinger"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Angi global HTTP-mellomtjener og eksklusjonslister"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Tøm"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Ingen mellomtjener for"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Gjenopprett standardinnstillinger"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Ferdig"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Vertsnavn"</string>
     <string name="proxy_error" msgid="8926675299638611451">"NB"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Vertsnavnet er ikke gyldig."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Eksklusjonslisten er ikke riktig formatert. Legg inn en kommadelt liste med ekskluderte domener."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du må skrive inn et portnummer."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Feltet for portnummer må være tomt om feltet for vertsnavn er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Portnummeret er ikke gyldig."</string>
@@ -187,18 +187,23 @@
     <string name="band_mode_failed" msgid="1495968863884716379">"Mislykket"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Vellykket"</string>
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Endringene vil tre i kraft når USB-kabelen kobles til på nytt"</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Skru på USB-masselagring"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Aktiver USB-masselagring"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Totalt antall byte:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Minnekort mangler"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-lagring ikke tilkoblet"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Minnekort mangler"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Tilgjengelig antall byte:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"Minnekortet blir brukt som en masselagringsenhet"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"Det er trygt å fjerne minnekortet"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"Minnekortet ble fjernet mens det fortsatt var i bruk!"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-lagr. brukt til masselagr."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Minnekortet blir brukt som en masselagringsenhet"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-lagring kan nå fjernes"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Det er trygt å fjerne minnekortet"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-lagr. fjernet under bruk!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Minnekortet ble fjernet mens det fortsatt var i bruk!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Brukt antall byte:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Leter etter media på minnekortet…"</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"Minnekortet ble montert skrivebeskyttet"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skanner USB-lagr. for medier"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Leter etter media på minnekortet…"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-lagr. har kun lesetilg."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Minnekortet ble montert skrivebeskyttet"</string>
+    <string name="skip_label" msgid="47510779345218297">"Hopp over"</string>
     <string name="next_label" msgid="4693520878012668114">"Neste"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Språk"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Velg aktivitet"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Batteriinformasjon"</string>
     <string name="display_label" msgid="7403874003169865762">"Skjerm"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Telefoninformasjon"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"Minnekort"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-lagring"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Minnekort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Mellomtjener-innstillinger"</string>
     <string name="cancel" msgid="6859253417269739139">"Avbryt"</string>
     <string name="settings_label" msgid="1626402585530130914">"Innstillinger"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Innstillinger"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Innstillinger"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flymodus"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Slå av alle trådløse tilkoblinger"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Velg en nettverksoperatør"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dato og tid"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Sett dato, tid, tidssone og formater"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Auto. dato og klokkeslett"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Bruk nettverkets eget klokkeslett"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Bruk nettverkets eget klokkeslett"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatisk tidssone"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Bruk nettverkets egen tidssone"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Bruk nettverkets egen tidssone"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Bruk 24-timers format"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Still klokken"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Tidssone"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorter etter tidssone"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Lås enhet etter tidsavbrudd"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Endre forsinkelse før enheten låses automatisk"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Plassering og sikkerhet"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Plassering og sikkerhet"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Plassering, skjermlås, SIM-kort-lås"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Avbryt"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Enhetsadministrasjon"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Velg enhetsadministratorer"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Legg til eller fjern enhetsadministratorer"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Velg enhetsadministratorer"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Legg til eller fjern enhetsadministratorer"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Slå på Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-innstillinger"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som høyttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For musikk og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk innstillinger"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Bruk NFC-teknologi for å lese og utveksle koder"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Trådløst nett"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Slå på trådløst nett"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Trådløsinnstillinger"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koble til nettverket"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Slett nettverk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Endre nettverk"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Nettverksinnstillinger"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Angi kode fra tilgangspunkt"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID for nettverket"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhet"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Passord"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Vis passord"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-innstillinger"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(uendret)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ikke spesifisert)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Husket"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Deaktivert"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Utenfor område"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Sikret med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Sikret med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Sikret med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS tilgjengelig)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, sikret med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koble til"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Slett"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP-innstillinger"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Lagre"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Avbryt"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Skriv inn en gyldig IP-adresse."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Standardruter"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Nettmaske"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Flyttbar trådløs sone"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Flyttbar trådløs sone <xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Flyttbar trådløs sone – feil"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Telefonnummer, signalstyrke, osv."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Avmonter minnekort, vis ledig plass"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Delt og sikker lagring"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Lagring"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Innstillinger for lagring"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Koble fra USB-lagring og vis tilgjengelig lagringsplass"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Avmonter minnekort, vis ledig plass"</string>
     <string name="status_number" msgid="5123197324870153205">"Telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-versjon"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Ikke tilgjengelig"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oppetid"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Våken tid"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Intern lagringsplass"</string>
-    <string name="sd_memory" msgid="151871913888051515">"Minnekort"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Intern lagring"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lagring"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Minnekort"</string>
     <string name="memory_available" msgid="418542433817289474">"Tilgjengelig plass"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total plass"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Avmonter/løs ut minnekort"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Løs ut minnekortet for trygg fjerning"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Koble fra delt lagring"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Avmonter/løs ut minnekort"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Koble fra intern USB-lagring"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Koble fra SD-kortet for trygg fjerning"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Aktiver PTP-modus"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Vises på USB som PTP-kameraenhet i stedet for MTP-enhet"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Sett inn et minnekort for å koble til"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Koble til minnekort"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Koble til minnekortet"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Formater minnekort"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Formater (fjern alt fra) minnekortet"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Sett inn USB-lagring"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Sett inn et minnekort for å koble til"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Koble til delt lagring"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Koble til minnekort"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Koble fra intern USB-lagring"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Koble til minnekortet"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Slett USB-lagring"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Slett SD-kort"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Sletter intern USB-lagring."</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Sletter alle data på telefonens SD-kort, som for eksempel musikk og bilder"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Ikke tilgjengelig"</string>
     <string name="read_only" msgid="6702420168629076340">" (skrivebeskyttet)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Koble fra minnekort"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Hvis du kobler fra minnekortet, vil ikke lenger alle programmene virke, og de kan være utilgjengelige inntil du kobler til minnekortet på nytt."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Fikk ikke koblet fra minnekort"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Får ikke koblet fra minnekort. Prøv på nytt senere."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"Minnekortet kobles fra. Kontroller status i varslingsfeltet."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Koble fra USB-lagring"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Koble fra minnekort"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Hvis du kobler fra USB-lagring, vil ikke lenger alle programmene virke, og de kan være utilgjengelige inntil du kobler til USB-lagring på nytt."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Hvis du kobler fra minnekortet, vil ikke lenger alle programmene virke, og de kan være utilgjengelige inntil du kobler til minnekortet på nytt."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Frakobl. av USB-lagr. misl."</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Fikk ikke koblet fra minnekort"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Kan ikke koble fra USB-lagring. Prøv på nytt senere."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Får ikke koblet fra minnekort. Prøv på nytt senere."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-lagring kobles fra."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-kort kobles fra."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Kobler fra minnekort"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Frakobling pågår"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Ferdig med å gjenopprette standardvalg for APN"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrikkinnstillinger"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Fjern alle data fra telefonen"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Dette vil fjerne alle data fra telefonen, herunder:"\n<li>"Google-kontoen din"</li>\n<li>"System- og programdata og -innstillinger"</li>\n<li>"Nedlastede programmer"</li>\n"Det vil ikke slette:"\n<li>"Gjeldende systemprogramvare og medfølgende programmer"</li>\n<li>"Filer på minnekortet, eksempelvis musikk eller bilder"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Dette sletter alle data fra telefonens "<b>"interne lagring"</b>", herunder:"\n\n<li>"Google-kontoen"</li>\n<li>"System- og programdata og innstillinger"</li>\n<li>"Nedlastede programmer"</li>\n\n"Hvis du vil slette alle data på telefonen, må "<b>"USB-kortet"</b>" slettes."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Dette sletter alle data fra telefonens "<b>"interne lagring"</b>", herunder:"\n\n<li>"Google-kontoen"</li>\n<li>"System- og programdata og innstillinger"</li>\n<li>"Nedlastede programmer"</li>\n\n"Hvis du også vil slette musikk, bilder og andre brukerdata, må "<b>"SD-kortet"</b>" slettes."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Slett USB-lagring"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Slett SD-kort"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Slett all intern USB-lagring."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Slett alle data på SD-kort."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Tilbakestill telefonen"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Fjern all personlig informasjon og nedlastede applikasjoner? Dette kan ikke gjøres om!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Fjern alt"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Tegn opplåsingsmønsteret"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Du må tegne opplåsingsmønsteret for å bekrefte tilbakestilling av telefonen."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Telefonen ble ikke tilbakestilt fordi tilbakestillingstjenesten ikke er tilgjengelig."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Formater minnekort"</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Sletter alle data fra minnekortet"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Dette valget vil slette alle data fra minnekortet i telefonen. Du vil miste ALLE data på kortet!"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"Formater minnekort"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Formater minnekortet? Dette vil fjerne alle data, og kan ikke gjøres om!"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Slett USB-lagring"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Slett SD-kort"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Sletter alle data i USB-lagr."</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Sletter alle data fra minnekortet"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Handlingen sletter USB-lagring. "<b>"Alle"</b>" data i USB-lagring vil gå tapt!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Handlingen sletter SD-kortet. "<b>"Alle"</b>" data på kortet vil gå tapt!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Slett USB-lagring"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Slett SD-kort"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Vil du formatere USB-lagring og slette alle lagrede filer? Handlingen kan ikke angres!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Vil du formatere SD-kortet og slette alle lagrede filer? Handlingen kan ikke angres!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Slett alt"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Tegn opplåsingsmønsteret"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Du må tegne opplåsingsmønsteret for å bekrefte formatering av minnekortet."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Du må tegne opplåsingsmønsteret for å bekrefte formateringen av USB-lagring."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Du må tegne opplåsingsmønsteret for å bekrefte slettingen av SD-kortet."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Samtaleinnstillinger"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Telefonsvarer, viderekobling, samtale venter, nummervisning"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tilknytning"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Feil under Bluetooth-tilknytning"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Kan ikke knytte til mer enn <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheter"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Innstillinger for Bluetooth-tilknytning"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Velg Bluetooth-enheter for tilknytning"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjelp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobile nettverk"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Innstillinger for roaming, nettverk, APN"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Aktiver GPS med hjelp"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Bruk tjener til å hjelpe GPS (opphev for å redusere nettverksbruken)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Bruk tjeneren til å hjelpe GPS (velg for å forbedre GPS-ytelsen)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Del med Google"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Om telefonen"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Vis juridisk informasjon, telefonstatus, programvareversjon"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridisk informasjon"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Ukjent"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sorter etter navn"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sorter etter størrelse"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Vis kjørende tjenester"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Vis bufrede prosesser"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Styr plass"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Velg filtreringsinnstillinger"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Tredjeparts"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kjører"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"På minnekort"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På minnekort"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktivert"</string>
     <string name="no_applications" msgid="5190227407135243904">"Ingen programmer."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortlagring"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Beregner størrelse på nytt…"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Slett"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"All informasjon du har lagret i denne applikasjonen vil bli fjernet permanent."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"versjon <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Flytt"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Flytt til telefonen"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Flytt til minnekort"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Flytt til USB-lagring"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Flytt til minnekort"</string>
     <string name="moving" msgid="6431016143218876491">"Flytter"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Det er ikke nok lagringsminne."</string>
     <string name="does_not_exist" msgid="837163572898468245">"Programmet fins ikke."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Foretrukket installeringssted"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Endre foretrukket plassering for installasjon av nye programmer."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Bruk av lagringsplass"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Vis lagringsplass for programmer"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kjørende tjenester"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Vis og kontroller tjenester som kjører for øyeblikket"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Starter på nytt"</string>
+    <string name="cached" msgid="1059590879740175019">"Bufret bakgrunnsprosess"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Ingenting kjører."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Startet av program."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> tilgjengelig"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> i bruk"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> grts."</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> brukt"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosess og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjeneste"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Innstillinger"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Denne tjenesten ble startet av det tilhørende programmet. Hvis du stopper tjenesten, er det ikke sikkert programmet fungerer slik det skal."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Dette programmet kan ikke stoppes på en trygg måte. Noe av arbeidet ditt kan gå tapt."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Denne er en gammel programprosess som beholdes for økt hastighet ved behov. Du trenger ikke stoppe den."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: for øyeblikket i bruk. Berør Innstillinger for å endre."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Hovedprosess som er i bruk."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Tjenesten <xliff:g id="COMP_NAME">%1$s</xliff:g> er i bruk."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Leverandøren <xliff:g id="COMP_NAME">%1$s</xliff:g> er i bruk."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Vil du stoppe systemtjenesten?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Er du sikker på at du vil stoppe denne systemtjenesten? I så fall kan det hende at enkelte funksjoner på telefonen kan slutte å fungere slik de skal, inntil du slår telefonen av og på igjen."</string>
     <string name="language_settings" msgid="502219872342167227">"Språk og tastatur"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Språk og tastatur"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Språkinnstillinger"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Tastaturinnstillinger"</string>
     <string name="phone_language" msgid="1165758957501090679">"Velg språk"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatisk erstatting"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Inndatametode"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Innstillinger for skriving av tekst"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Innstillinger for <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Innstillinger for skjermtastatur"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Fysisk tastatur"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Innstillinger for innebygget tastatur"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Innebygd tastatur"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Innstillinger for innebygd tastatur"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Utvikling"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Innstillinger for applikasjonsutvikling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-debugging"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Denne tilgjengelighetstjenesten har tilgang til all tekst du skriver, inkludert personlig data som passord og kredittkortnummer. Den kan også loggføre alt som skjer i brukergrensesnittet. Det kommer fra programmet <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Vil du aktivere denne tjenesten?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Slå av tilgjengelighetsstøtten?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Finner ingen tilgjengelighetsprogrammer"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Du har ikke installert et tilgjengelighetsprogram."\n\n"Du kan laste ned en skjermleser for enheten på Android Market."\n\n"Klikk på OK for å installere skjermleseren."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Tilgjengelighetsskript"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Last ned tilgjengelighetsskript"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Tillat prog. å laste ned tilgjengelighetsskript fra Google"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Enkelte programmer kan be Google om å laste ned skript til telefonen som gjøres programinnholdet mer tilgjengelig. Er du sikker på at du vil tillate Google å installere tilgjengelighetsskript på telefonen?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"På/av-knapp"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Legg på med på/av"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Ved å trykke på av-knappen under en samtale, avsluttes samtalen i stedet for at skjermen slås av"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Lader"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skjerm på"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS på"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Trådløst nettverk"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefonsignal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Tid enheten har vært våken"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"Tid trådløsnettet har vært aktivt"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"Tid Bluetooth har vært aktivt"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi on time"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi on time"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Detaljert batteribrukinformasjon"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Bruksdetaljer"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Prosessor i forgrunnen"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behold aktiv"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"WiFi kjører"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data sendt"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Data mottatt"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Info om applikasjon"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Innstillinger for applikasjon"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Innstillinger for skjerm"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Innstillinger for trådløsnett"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Innstillinger for Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Innstillinger for Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batteri brukt av telefonsamtaler"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Batteri brukt når telefonen ikke er i bruk"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Gir applikasjoner tilgang til sikre sertifikater og andre akkreditiver"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Velg passord"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Skriv inn passordet for akkreditivlageret"</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Installer fra minnekort"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Installer krypterte sertifikater fra minnekort"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installer fra USB-lagr."</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installer fra minnekort"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Inst. sert. fra USB-lagr."</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Installer krypterte sertifikater fra minnekort"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Velg passord"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Velg eller endre passord for akkreditivlageret"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Tøm lager"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Sikkerhetskopiering og gjenoppretting"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhetskopier data"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Sikkerhetskopier innstillingene og andre programdata."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Sikkerhetskopier programdata, Wi-Fi-passord og andre innstillinger til Googles tjenere"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Auto-gjenoppretting"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Gjenopprett sikkerhetskopierte innstillinger og andre data hvis jeg installerer et program på nytt."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Gjenopprett sikkerhetskopierte innstillinger og andre data hvis jeg installerer et program på nytt"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sikkerhetskopi"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Er du sikker på at du ønsker å slutte med backup av innstillinger og programdata og fjerne alle kopier på Googles tjenere?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Er du sikker på at du ønsker å avslutte sikkerhetskopiering av Wi-Fi-passord, bokmerker og andre innstillinger og programdata og slette alle kopier på Googles tjenere?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Innstillinger for enhetsadministrasjon"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Enhetsadministrator"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiver"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Oppdater liste"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Hopp over"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Neste"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Skanner nettverk ..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Trykk for å velge nettverk"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Koble til eksisterende nettverk"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Angi nettverkskonfigurasjon"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Koble til et nytt nettverk"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Kobler til ..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Tilkoblet"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Gå videre til neste trinn"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Det er midlertidige problemer med synkroniseringen. Vent litt."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Legg til konto"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Generelle synk.innst."</string>
+    <string name="background_data" msgid="5779592891375473817">"Bakgrunnsdata"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Programmer kan synkronisere, sende og motta data"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Obs"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Deaktivering av bakgrunnsdata sparer batteri og reduserer datatrafikken. Noen programmer kan fortsatt bruke tilkoblingen for bakgrunnsdata."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Automatisk synkronisering"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Programmer synkroniser data automatisk"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Administrer kontoer"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synkronisering er på"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synkronisering er av"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Synkroniseringsfeil"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 6b4216d..860617e 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"passief"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Uit"</item>
     <item msgid="3165868966179561687">"Melding"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 52f3755..e1c719c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"SD-kaart ontkoppelen"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"SD-kaart formatteren"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"USB-opslag ontkoppelen"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD-kaart ontkoppelen"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB-opslag wissen"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD-kaart wissen"</string>
     <string name="small_font" msgid="2295331917424072635">"Klein"</string>
     <string name="medium_font" msgid="2068475425515133701">"Gemiddeld"</string>
     <string name="large_font" msgid="599055175160971446">"Groot"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"SD-kaart"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB-opslag"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD-kaart"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Accustatus:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Voedingsstekker:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Accuschaal:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Versleten"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Overspanning"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Onbekende fout"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Kan worden gevonden"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Kan gedurende <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> seconden worden gevonden…"</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> starten"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Account:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Proxyinstellingen"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Algemene HTTP-proxy en uitsluitingslijsten instellen"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Wissen"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Poort"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Geen proxy voor"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Standaardwaarden herstellen"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Gereed"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Hostnaam"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Let op"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"De hostnaam die u heeft ingevoerd, is ongeldig."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"De getypte uitsluitingslijst is niet correct opgemaakt. Geef een door komma\'s gescheiden lijst van uitgesloten domeinen op."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"U moet het poortveld invullen."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Het poortveld moet leeg zijn als het hostveld leeg is."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"De poort die u heeft ingevoerd, is ongeldig."</string>
@@ -189,16 +189,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Wijzigingen worden van kracht als de USB-kabel opnieuw wordt aangesloten"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB-massaopslag inschakelen"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Totaal aantal bytes:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Geen SD-kaart"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-opslag niet gekoppeld"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Geen SD-kaart"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Beschikbare bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"SD-kaart wordt gebruikt als apparaat voor massaopslag"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"U kunt de SD-kaart nu veilig verwijderen"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"De SD-kaart is verwijderd terwijl deze nog werd gebruikt!"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-opslag wordt gebruikt als apparaat voor massaopslag"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-kaart wordt gebruikt als apparaat voor massaopslag"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"U kunt de USB-opslag nu veilig verwijderen"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"U kunt de SD-kaart nu veilig verwijderen"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-opslag verwijderd tijdens gebruik!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"De SD-kaart is verwijderd terwijl deze nog werd gebruikt!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Gebruikte bytes:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"SD-kaart scannen op media..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"Gekoppelde SD-kaart alleen-lezen"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB-opslag scannen op media..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD-kaart scannen op media..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Gekopp. USB-opslag alleen-lezen"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Gekoppelde SD-kaart alleen-lezen"</string>
+    <string name="skip_label" msgid="47510779345218297">"Ovrsl"</string>
     <string name="next_label" msgid="4693520878012668114">"Volgende"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Taal"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Activiteit selecteren"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Accu-info"</string>
     <string name="display_label" msgid="7403874003169865762">"Weergave"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Telefooninfo"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"SD-kaart"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-opslag"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kaart"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-instellingen"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuleren"</string>
     <string name="settings_label" msgid="1626402585530130914">"Instellingen"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Instellingen"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Instellingen"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Vliegmodus"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Alle draadloze verbindingen uitschakelen"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Een mobiele provider selecteren"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum en tijd"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Datum, tijd, tijdzone en notaties instellen"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Autom. tijd en datum"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Netwerktijd gebruiken"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Netwerktijd gebruiken"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatische tijdzone"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Netwerktijdzone gebruiken"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Netwerktijdzone gebruiken"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-uurs klok gebruiken"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Tijd instellen"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Tijdzone selecteren"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorteren op tijdzone"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Apparaat vergrendelen na time-out"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"De vertraging aanpassen waarna het apparaat automatisch wordt vergrendeld"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Locatie en beveiliging"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Locatie- en beveiligingsinstellingen"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Mijn locatie\', schermontgrendeling, SIM- en referentieopslagvergrendeling instellen"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuleren"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Apparaatbeheer"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Apparaatbeheerders kiezen"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Apparaatbeheerders toevoegen of verwijderen"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Apparaatbeheerders kiezen"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Apparaatbeheerders toevoegen of verwijderen"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth inschakelen"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-instellingen"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als luidsprekertelefoon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Voor muziek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Instellingen onthouden"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Near Field Communication gebruiken om tags te lezen en uit te wisselen"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi inschakelen"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi-instellingen"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Verbinding maken met netwerk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Netwerk vergeten"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netwerk aanpassen"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Netwerkinstelling"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"PIN opgeven via toegangspunt"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID van netwerk"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Beveiliging"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteit"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonieme identiteit"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Wachtwoord"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Wachtwoord weergeven"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-instellingen"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ongewijzigd)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(niet opgegeven)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Onthouden"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Uitgeschakeld"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Niet binnen bereik"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Beveiligd met <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Beveiligd met <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Beveiligd met <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS beschikbaar)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, beveiligd met <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeten"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP-instellingen"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Opslaan"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Annuleren"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Voer een geldig IP-adres in."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Netmasker"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Draagbare Wi-Fi-hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Draagbare hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actief"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fout met draagbare Wi-Fi-hotspot"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Telefoonnummer, signaal, enzovoort"</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"SD-kaart ontkoppelen, beschikbare opslagruimte weergeven"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Gedeelde en beveiligde opslag"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Opslagruimte"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Instellingen voor opslag"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB-opslag ontkoppelen, beschikbare opslag weergeven"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD-kaart ontkoppelen, beschikbare opslagruimte weergeven"</string>
     <string name="status_number" msgid="5123197324870153205">"Mijn telefoonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-versie"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Niet beschikbaar"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Bedrijfstijd"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Stand-bytijd"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Intern telefoongeheugen"</string>
-    <string name="sd_memory" msgid="151871913888051515">"SD-kaart"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Interne opslag"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-opslag"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kaart"</string>
     <string name="memory_available" msgid="418542433817289474">"Beschikbare ruimte"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totale ruimte"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"SD-kaart ontkoppelen"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"De SD-kaart ontkoppelen zodat u deze veilig kunt verwijderen"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gedeelde opslag ontkoppelen"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-kaart ontkoppelen"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Interne USB-opslag ontkoppelen"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Ontkoppel de SD-kaart zodat u deze veilig kunt verwijderen"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"PTP-modus inschakelen"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Weergeven op USB als PTP-camera-apparaat in plaats van als MTP-apparaat"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Plaats een SD-kaart om deze te koppelen"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"SD-kaart koppelen"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"De SD-kaart koppelen"</string>
-    <string name="sd_format" msgid="5448738337382712203">"SD-kaart formatteren"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"De SD-kaart formatteren (wissen)"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"USB-opslag plaatsen voor koppelen"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Plaats een SD-kaart om deze te koppelen"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Gedeelde opslag koppelen"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"SD-kaart koppelen"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Interne USB-opslag koppelen"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"De SD-kaart koppelen"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB-opslag wissen"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"SD-kaart wissen"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Hiermee worden alle gegevens in de interne USB-opslag van de telefoon gewist, zoals muziek en foto\'s"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Hiermee worden alle gegevens op de SD-kaart van de telefoon gewist, zoals muziek en foto\'s"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Niet beschikbaar"</string>
     <string name="read_only" msgid="6702420168629076340">" (Alleen-lezen)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"SD-kaart ontkoppelen"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Als u de SD-kaart ontkoppelt, worden bepaalde toepassingen die u gebruikt, gestopt en worden deze mogelijk pas weer beschikbaar wanneer u de SD-kaart opnieuw koppelt."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Ontkoppelen van SD-kaart is mislukt"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Kan SD-kaart niet ontkoppelen. Probeer het later opnieuw."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"SD-kaart wordt ontkoppeld. Controleer het gedeelte met meldingen voor de status."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"USB-opslag ontkoppelen"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"SD-kaart ontkoppelen"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Als u de USB-opslag ontkoppelt, worden bepaalde toepassingen die u gebruikt, gestopt en worden deze mogelijk pas weer beschikbaar wanneer u de USB-opslag opnieuw koppelt."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Als u de SD-kaart ontkoppelt, worden bepaalde toepassingen die u gebruikt, gestopt en worden deze mogelijk pas weer beschikbaar wanneer u de SD-kaart opnieuw koppelt."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Ontkoppelen USB-opslag mislukt"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Ontkoppelen van SD-kaart is mislukt"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Kan USB-opslag niet koppelen. Probeer het later opnieuw."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Kan SD-kaart niet ontkoppelen. Probeer het later opnieuw."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-opslag wordt ontkoppeld."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-kaart wordt ontkoppeld."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Ontkoppelen"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Ontkoppelen wordt uitgevoerd"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Accustatus"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Herstellen van standaard-APN-instellingen voltooid"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrieksinstellingen terug"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Alle gegevens op de telefoon wissen"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Deze functie wist alle gegevens van uw telefoon, waaronder:"\n<li>"Uw Google-account"</li>\n<li>"Systeem- en toepassingsgegevens en -instellingen"</li>\n<li>"Gedownloade toepassingen"</li>"De volgende gegevens worden niet gewist:"\n\n<li>"Huidige systeemsoftware en gebundelde toepassingen"</li>\n<li>"Bestanden op de SD-kaart, zoals muziek en foto\'s"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw telefoon gewist, waaronder:"\n\n<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de toepassingen"</li>\n<li>"Gedownloade toepassingen"</li>\n\n"Als u alle gegevens op deze telefoon wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw telefoon gewist, waaronder:"\n\n<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de toepassingen"</li>\n<li>"Gedownloade toepassingen"</li>\n\n"Als u ook muziek, foto\'s en andere gegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-opslag wissen"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-kaart wissen"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Alle gegevens in de interne USB-opslag van de telefoon wissen, zoals muziek en foto\'s."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Alle gegevens op de SD-kaart van de telefoon wissen, zoals muziek en foto\'s."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Telefoon opnieuw instellen"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Alle persoonlijke gegevens en gedownloade toepassingen wissen? U kunt deze actie niet ongedaan maken."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Alles wissen"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Teken uw ontgrendelingspatroon"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"U moet uw ontgrendelingspatroon tekenen om het opnieuw instellen van de telefoon te bevestigen."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Niet opnieuw ingesteld, omdat de service \'Systeem wissen\' niet beschikbaar is."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"SD-kaart formatteren."</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Alle gegevens op de SD-kaart wissen"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Deze actie wist de gegevens van de SD-kaart die in de telefoon is geplaatst. ALLE gegevens op de kaart gaan dan verloren."</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"SD-kaart formatteren"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Wilt u de SD-kaart formatteren en al uw mediabestanden wissen? Deze actie kan niet ongedaan worden gemaakt."</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-opslag wissen"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"SD-kaart wissen"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Alle gegevens in USB-opslag wissen"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Alle gegevens op de SD-kaart wissen"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Met deze actie wordt de USB-opslag gewist. "<b>"Alle"</b>" opgeslagen gegevens gaan verloren!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Met deze actie wordt de SD-kaart gewist. "<b>"Alle"</b>" gegevens op de kaart gaan verloren!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"USB-opslag wissen"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"SD-kaart wissen"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"USB-opslag formatteren en alle opgeslagen bestanden wissen? Actie kan niet ongedaan worden gemaakt."</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"SD-kaart wissen en alle opgeslagen bestanden verwijderen? Actie kan niet ongedaan worden gemaakt."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Alles wissen"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Teken uw ontgrendelingspatroon"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"U moet uw ontgrendelingspatroon tekenen om het formatteren van een SD-kaart te bevestigen."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de USB-opslag wilt formatteren."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de SD-kaart wilt wissen."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Oproepinstellingen"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Voicemail, oproepen doorschakelen, wisselgesprek, beller-id instellen"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tethering"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Fout met Bluetooth-tethering"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Kan niet meer dan <xliff:g id="MAXCONNECTION">%1$d</xliff:g> apparaten tetheren"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering van <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt opgeheven."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Instellingen voor Bluetooth-tethering"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Bluetooth-apparaten selecteren voor tethering"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiele netwerken"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Opties voor roaming, netwerken, APN\'s instellen"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Ondersteunde GPS gebruiken"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Server gebruiken ter ondersteuning van GPS (uitschakelen om het netwerkgebruik te beperken)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Server gebruiken ter ondersteuning van GPS (uitschakelen om GPS-prestaties te verbeteren)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"\'Mijn locatie\' gebruiken"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Over de telefoon"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Juridische info, telefoonstatus, softwareversie weergeven"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridische informatie"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Onbekend"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sorteren op naam"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sorteren op grootte"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Actieve services weergeven"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Gecachte processen weerg."</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Ruimte beheren"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Filteropties selecteren"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alles"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Gedownload"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Wordt uitgevoerd"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"Op SD-kaart"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-opslag"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Op SD-kaart"</string>
     <string name="disabled" msgid="9206776641295849915">"Uitgeschakeld"</string>
     <string name="no_applications" msgid="5190227407135243904">"Geen toepassingen."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Interne opslag"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-opslag"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kaartopslag"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Grootte opnieuw berekenen..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Verwijderen"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Alle gegevens van deze toepassing worden permanent verwijderd. Dit omvat alle bestanden, instellingen, accounts, databases, enzovoort."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"versie <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Verplaatsen"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Verplaatsen naar telefoon"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Verplaatsen naar SD-kaart"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Verpl. naar USB-opslag"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Verplaatsen naar SD-kaart"</string>
     <string name="moving" msgid="6431016143218876491">"Verplaatsen"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Er is niet voldoende opslag beschikbaar."</string>
     <string name="does_not_exist" msgid="837163572898468245">"De toepassing bestaat niet."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Voorkeursinstallatielocatie"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"De voorkeursinstallatielocatie voor nieuwe toepassingen wijzigen."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Opslaggebruik"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Gebruikte opslagruimte voor toepassingen weergeven"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Actieve services"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Services die momenteel actief zijn, weergeven en beheren"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Opnieuw starten"</string>
+    <string name="cached" msgid="1059590879740175019">"Gecacht achtergrondproces"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Niets wordt uitgevoerd."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Gestart door toepassing."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> beschikbaar"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> in gebruik"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> vrij"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> gebr."</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces en <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Instellingen"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Deze service is gestart door de toepassing. Als de service wordt gestopt, kan de toepassing vastlopen."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Deze toepassing kan niet veilig worden gestopt. Als de toepassing wordt gestopt, kunt u een deel van uw huidige werk kwijtraken."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Dit is een oud toepassingsproces dat is behouden voor hogere snelheid in geval het weer nodig is. Er is meestal geen reden om dit te stoppen."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: momenteel in gebruik. Raak \'Instellingen\' aan om dit te bedienen."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Hoofdproces dat in gebruik is."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Service <xliff:g id="COMP_NAME">%1$s</xliff:g> in gebruik."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Provider <xliff:g id="COMP_NAME">%1$s</xliff:g> in gebruik."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Systeemservice stoppen?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Weet u zeker dat u deze systeemservice wilt stoppen? Als u dit doet, werken bepaalde functies van uw telefoon mogelijk pas weer correct nadat u de telefoon heeft uitgeschakeld en weer ingeschakeld."</string>
     <string name="language_settings" msgid="502219872342167227">"Taal en toetsenbord"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Taal- en toetsenbordinstellingen"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Taalinstellingen"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Toetsenbordinstellingen"</string>
     <string name="phone_language" msgid="1165758957501090679">"Taal selecteren"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatisch vervangen"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Invoermethode"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Opties voor tekstinvoer beheren"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Instellingen voor <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Instellingen voor schermtoetsenbord"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Apparaattoetsenbord"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Instellingen voor ingebouwd toetsenbord"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Geïntegreerd toetsenbord"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Geïntegreerde, fysieke toetsenbordinstellingen"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Ontwikkeling"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Opties instellen voor toepassingsontwikkeling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-foutopsporing"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"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" msgid="8930591383312775132">"Toegankelijkheid uitschakelen?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Geen toepassingen voor toegankelijkheid gevonden"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Er zijn geen toepassingen voor toegankelijkheid geïnstalleerd."\n\n"U kunt een schermlezer voor uw apparaat downloaden van Android Market."\n\n"Klik op \'OK\' om de schermlezer te installeren."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Toegankelijkheidsscripts"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Toegankelijkheidsscripts downloaden"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Toepassingen mogen toegankelijkheidsscripts downloaden via Google"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Sommige toepassingen kunnen Google vragen scripts naar uw telefoon te downloaden die hun inhoud toegankelijker maakt. Weet u zeker dat u Google wilt toestaan toegankelijkheidsscripts op uw telefoon te installeren?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Aan/uit-knop"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Knop beëindigt oproep"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Als u tijdens een oproep op de aan/uit-knop drukt, wordt de oproep beëindigd in plaats van dat het scherm wordt uitgeschakeld"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Opladen"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Scherm aan"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ingeschakeld"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Ingeschakeld"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefoonsignaal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Stand-bytijd apparaat"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"Tijd Wi-Fi aan"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"Tijd Wi-Fi aan"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi op tijd"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi op tijd"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Details over accugebruik"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gebruiksdetails"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU op voorgrond"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ingeschakeld houden"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi actief"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Telefoon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Gegevens verzonden"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Gegevens ontvangen"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Toepassingsinfo"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Toepassingsinstellingen"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Instellingen weergeven"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Wi-Fi-instellingen"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi-instellingen"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-instellingen"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Accu gebruikt door spraakoproepen"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Accu gebruikt wanneer telefoon inactief is"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Toepassingen mogen veilige certificaten en andere referenties openen"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Voer het wachtwoord in"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Geef het wachtwoord voor de opslag van referenties op."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Installeren van SD-kaart"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Gecodeerde certificaten installeren vanaf SD-kaart"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installeren uit USB-opslag"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installeren van SD-kaart"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Gecodeerde certificaten van USB-opslag installeren"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Gecodeerde certificaten installeren vanaf SD-kaart"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Wachtwoord instellen"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Het wachtwoord voor de opslag van referenties instellen"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Opslag wissen"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Back-up maken en terugzetten"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Persoonlijke gegevens"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back-up maken van mijn gegevens"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Back-up maken van mijn instellingen en andere toepassingsgegevens."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Een back-up van toepassingsgegevens, Wi-Fi-wachtwoorden en andere instellingen maken op de Google-servers"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisch terugzetten"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"In een back-up opgeslagen instellingen of andere gegevens herstellen als ik een toepassing opnieuw installeer."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"In een back-up opgeslagen instellingen of andere gegevens herstellen als ik een toepassing opnieuw installeer"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Back-up"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Weet u zeker dat het maken van back-ups van uw instellingen en toepassingsgegevens wilt stoppen en alle kopieën op Google-servers wilt wissen?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Weet u zeker dat u het maken van back-ups van uw Wi-Fi-wachtwoorden, bladwijzers en andere instellingen en toepassingsgegevens wilt stoppen en alle kopieën op Google-servers wilt wissen?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Instellingen voor apparaatbeheer"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Apparaatbeheerder"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deactiveren"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Lijst vernieuwen"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Overslaan"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Volgende"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Netwerken scannen..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Raak aan om netwerk te selecteren"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Verbinding maken met bestaand netwerk"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Netwerkconfiguratie invoeren"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Verbinding maken met nieuw netwerk"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Verbinding maken..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Verbonden"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Doorgaan naar de volgende stap"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Er zijn momenteel problemen met de synchronisatie. Synchronisatie wordt snel opnieuw uitgevoerd."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Account toevoegen"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Algemene synchronisatie-inst."</string>
+    <string name="background_data" msgid="5779592891375473817">"Achtergrondgegevens"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Onbeperkt gegevens synchroniseren, verzenden en ontvangen"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Let op"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Als u achtergrondgegevens uitschakelt, bespaart u acculading en wordt het gegevensverbruik verlaagd. Sommige toepassingen maken mogelijk nog steeds gebruik van de verbinding voor achtergrondgegevens."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Automatische synchronisatie"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Toepassingen kunnen gegevens automatisch synchroniseren"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Accounts beheren"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synchroniseren AAN"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchroniseren UIT"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Synchronisatiefout"</string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 4caf811..4c493a2 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statyczny"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Wyłączony"</item>
     <item msgid="3165868966179561687">"Alarm"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8147c38..1063aa6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Odłącz kartę SD"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Formatuj kartę SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Odłącz nośnik USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Odłącz kartę SD"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Wyczyść nośnik USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Wyczyść kartę SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Mały"</string>
     <string name="medium_font" msgid="2068475425515133701">"Średni"</string>
     <string name="large_font" msgid="599055175160971446">"Duży"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"Karta SD"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Nośnik USB"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Karta SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Stan baterii:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Podłączone zasilanie:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Poziom baterii:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Rozładowana"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Przepięcie"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nieznany błąd"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Wykrywalny"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Wykrywalny przez <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s …"</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Rozpocznij <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Konto:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Ustawienia serwera proxy"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Ustaw globalny serwer proxy HTTP i listę wykluczeń"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Wyczyść"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Brak serwera proxy dla"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Przywróć ustawienia domyślne"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Gotowe"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Nazwa hosta"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Uwaga"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Wprowadzona nazwa hosta jest nieprawidłowa."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Wpisana lista wykluczeń nie jest poprawnie sformatowana. Wprowadź rozdzielaną przecinkami listę wykluczonych domen."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Należy uzupełnić pole port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pole port musi być puste, jeśli pole host jest puste."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Wprowadzony port jest nieprawidłowy."</string>
@@ -189,16 +189,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Zmiany zostaną wprowadzone po ponownym podłączeniu przewodu USB"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Włącz pamięć masową USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Łącznie bajtów:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Brak karty SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Nośnik USB nie jest podłączony"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Brak karty SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Dostępnych bajtów:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"Karta SD wykorzystywana jest jako pamięć masowa"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"Można teraz bezpiecznie usunąć kartę SD"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"Karta SD została usunięta, gdy była używana!"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Nośnik USB jako pamięć masowa"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Karta SD wykorzystywana jest jako pamięć masowa"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Można teraz wyjąć nośnik USB"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Można teraz bezpiecznie usunąć kartę SD"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Wyjęto USB podczas używania."</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Karta SD została usunięta, gdy była używana!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Wykorzystanych bajtów:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Przeszukiwanie karty SD w poszukiwaniu multimediów..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"Karta SD jest podłączona tylko do odczytu"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Trwa skanowanie nośnika USB…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Przeszukiwanie karty SD w poszukiwaniu multimediów..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Nośnik USB podłącz. do odczytu"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Karta SD jest podłączona tylko do odczytu"</string>
+    <string name="skip_label" msgid="47510779345218297">"Pomiń"</string>
     <string name="next_label" msgid="4693520878012668114">"Dalej"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Język"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Wybierz czynność"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Informacje o baterii"</string>
     <string name="display_label" msgid="7403874003169865762">"Wyświetlacz"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Informacje o telefonie"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"Karta SD"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Nośnik USB"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Karta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Ustawienia proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Anuluj"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ustawienia"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Ustawienia"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Ustawienia"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Tryb samolotowy"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Wyłącz wszystkie połączenia bezprzewodowe"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Wybierz operatora sieci"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data i godzina"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Ustaw format daty, godziny i strefę czasową"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatyczna data i godzina"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Użyj czasu podanego przez sieć"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Użyj czasu podanego przez sieć"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatyczna strefa czasowa"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Użyj strefy czasowej podanej przez sieć"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Użyj strefy czasowej podanej przez sieć"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Format 24-godzinny"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Ustaw godzinę"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Wybierz strefę czasową"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortuj według strefy czasowej"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Blokuj urządzenie po czasie oczekiwania"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Dostosuj opóźnienie automatycznego blokowania urządzenia"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Lokalizacja i zabezpieczenia"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Ustawienia lokalizacji i zabezpieczeń"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Anuluj"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administracja urządzeniem"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Wybierz administratorów"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Dodaj lub usuń administratorów urządzenia"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Wybierz administratorów"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Dodaj lub usuń administratorów urządzenia"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Włącz Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Ustawienia Bluetooth"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon w trybie głośnika"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Dla muzyki i multimediów"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamiętaj ustawienia"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"Komunikacja NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Używaj komunikacji Near Field Communication do odczytywania i wymiany tagów"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Włącz Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Ustawienia Wi-Fi"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Połącz z siecią"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Zapomnij sieć"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modyfikuj sieć"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Konfiguracja sieci"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Wpisz kod PIN z punktu dostępu"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"Identyfikator SSID sieci"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpieczenia"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Tożsamość"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Tożsamość anonimowa"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Hasło"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Pokaż hasło"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Ustawienia IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nie zmieniono)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nie określono)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Zapamiętana"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Wyłączona"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Poza zasięgiem"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Metoda zabezpieczenia: <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS dostępny)."</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Połącz"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zapomnij"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Ustawienia IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Zapisz"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Anuluj"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Wprowadź poprawny adres IP."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brama"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Maska sieci"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Przenośny punkt dostępu Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Przenośny punkt dostępu <xliff:g id="NETWORK_SSID">%1$s</xliff:g> jest aktywny"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Błąd przenośnego punktu dostępu Wi-Fi"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Informacje o telefonie"</string>
     <string name="device_status" msgid="607405385799807324">"Informacje o telefonie"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Numer telefonu, sygnał itd."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Odłącz kartę SD, pokaż ilość dostępnej pamięci w telefonie"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Pamięć współdzielona i bezpieczna"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Pamięć"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Ustawienia pamięci"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Odłącz nośnik USB i wyświetl ilość dostępnej pamięci"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Odłącz kartę SD, pokaż ilość dostępnej pamięci w telefonie"</string>
     <string name="status_number" msgid="5123197324870153205">"Mój numer telefonu"</string>
     <string name="status_min_number" msgid="3519504522179420597">"Numer MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Wersja listy PRL"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Niedostępny"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Czas działania"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Czas działania (włączony)"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Pamięć wewnętrzna telefonu"</string>
-    <string name="sd_memory" msgid="151871913888051515">"Karta SD"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Pamięć wewnętrzna"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Nośnik USB"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Karta SD"</string>
     <string name="memory_available" msgid="418542433817289474">"Dostępne miejsce"</string>
     <string name="memory_size" msgid="6629067715017232195">"Całkowita pojemność"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Odłącz kartę SD"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Odłącz kartę SD, aby bezpiecznie ją usunąć"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odłącz pamięć współdzieloną"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Odłącz kartę SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Odłącz wewnętrzny nośnik USB"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Odłącz kartę SD, aby bezpiecznie ją wyjąć"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Włącz tryb PTP"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Przedstawiaj przez USB jako aparat PTP, a nie urządzenie MTP"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Włóż kartę SD w celu zainstalowania"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Zainstaluj kartę SD"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Zainstaluj kartę SD"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Formatuj kartę SD"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Formatuj (wymaż) kartę SD"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Włóż USB do podłączenia"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Włóż kartę SD w celu zainstalowania"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Podłącz pamięć współdzieloną"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Zainstaluj kartę SD"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Podłącz wewnętrzny nośnik USB"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Zainstaluj kartę SD"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Wyczyść nośnik USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Wyczyść kartę SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Wymazuje wszystko z wewn. USB"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Wymazuje wszystkie dane z karty SD telefonu, takie jak muzyka czy zdjęcia"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Niedostępna"</string>
     <string name="read_only" msgid="6702420168629076340">" (Tylko do odczytu)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Odinstaluj kartę SD"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Jeśli odinstalujesz kartę SD, niektóre używane aplikacje zostaną zatrzymane i mogą być niedostępne do chwili jej ponownego zainstalowania."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Odinstalowanie karty SD nie powiodło się"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Nie można odinstalować karty SD. Spróbuj ponownie później."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"Karta SD zostanie odinstalowana. Sprawdź stan w obszarze powiadomień."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Odłącz nośnik USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Odinstaluj kartę SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Jeśli odłączysz nośnik USB, niektóre używane aplikacje zostaną zatrzymane i mogą być niedostępne do momentu ponownego podłączenia tego nośnika USB."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Jeśli odinstalujesz kartę SD, niektóre używane aplikacje zostaną zatrzymane i mogą być niedostępne do chwili jej ponownego zainstalowania."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Niepowodzenie odłączania USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Odinstalowanie karty SD nie powiodło się"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Nie można odłączyć nośnika USB. Spróbuj ponownie później."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Nie można odinstalować karty SD. Spróbuj ponownie później."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Nośnik USB zostanie odłączony."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Karta SD zostanie odłączona."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Odinstalowywanie"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Odinstalowywanie w toku"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stan baterii"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Zakończono resetowanie domyślnych ustawień APN"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ustawienia fabryczne"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Wymazuje wszystkie dane w telefonie"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Spowoduje to wymazanie wszystkich danych w telefonie, w tym:"\n<li>"danych konta Google;"</li>\n<li>"danych i ustawień systemu oraz aplikacji;"</li>\n<li>"pobranych aplikacji."</li>\n"Nie zostaną wymazane:"\n<li>"bieżące oprogramowanie systemowe i dołączone aplikacje;"</li>\n<li>"pliki na kartach SD, takie jak utwory muzyczne i zdjęcia."</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Spowoduje to wymazanie wszystkich danych z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:"\n\n<li>"danych konta Google,"</li>\n<li>"danych i ustawień systemu oraz aplikacji,"</li>\n<li>"pobranych aplikacji."</li>\n\n"Aby usunąć wszystkie dane z tego telefonu, należy wyczyścić "<b>"nośnik USB"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Spowoduje to wymazanie wszystkich danych z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:"\n\n<li>"danych konta Google,"</li>\n<li>"danych i ustawień systemu oraz aplikacji,"</li>\n<li>"pobranych aplikacji."</li>\n\n"Aby usunąć również muzykę, zdjęcia i inne dane użytkownika, należy wyczyścić "<b>"kartę SD"</b>"."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Wyczyść nośnik USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Wyczyść kartę SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Wymaż wszystko z wewn. USB."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Wymaż wszystko z karty SD."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Resetuj telefon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Czy usunąć wszystkie informacje osobiste i wszystkie pobrane aplikacje? Tej operacji nie można cofnąć!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Wymaż wszystko"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Narysuj wzór odblokowania"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Aby potwierdzić resetowanie telefonu, musisz narysować swój wzór odblokowania."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Nie wykonano resetowania, ponieważ usługa czyszczenia systemu nie jest dostępna."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Formatuj kartę SD."</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Wymazuje wszystkie dane z karty SD"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Ta akcja spowoduje wymazanie danych z karty SD w telefonie. WSZYSTKIE dane na karcie zostaną utracone."</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"Formatuj kartę SD"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Czy sformatować kartę SD i wymazać wszystkie multimedia? Nie można cofnąć tej akcji!"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Wyczyść nośnik USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Wyczyść kartę SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Wymazuje wszystko z nośnika USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Wymazuje wszystkie dane z karty SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Ta czynność spowoduje wymazanie nośnika USB. "<b>"Wszystkie"</b>" zapisane na nim dane zostaną utracone!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Ta czynność spowoduje wymazanie karty SD. "<b>"Wszystkie"</b>" zapisane na niej dane zostaną utracone!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Wyczyść nośnik USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Wyczyść kartę SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Czy wyczyścić nośnik USB, usuwając wszystkie zapisane na nim pliki? Tej czynności nie można cofnąć."</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Czy wyczyścić kartę SD, usuwając wszystkie zapisane na niej pliki? Tej czynności nie można cofnąć."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Wymaż wszystko"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Narysuj wzór odblokowania"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Aby potwierdzić formatowanie karty SD, należy narysować swój wzór odblokowania."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Aby potwierdzić zamiar wyczyszczenia nośnika USB, musisz narysować wzór odblokowania."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Aby potwierdzić zamiar wyczyszczenia karty SD, musisz narysować wzór odblokowania."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ustawienia połączeń"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Poczta głosowa, przekierowania połączeń, poł. oczekujące, ID rozmówcy"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Powiązanie USB"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Błąd powiązania Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Nie można powiązać więcej niż <xliff:g id="MAXCONNECTION">%1$d</xliff:g> urządzeń"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Powiązanie z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie anulowane."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Ustawienia powiązania Bluetooth"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Wybierz urządzenia Bluetooth do powiązania"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoc"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Sieci komórkowe"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Ustaw opcje roamingu, sieci, nazw APN"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Użyj wspomaganego systemu GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Użyj serwera do wspomagania systemu GPS (usuń zaznaczenie, aby zmniejszyć ruch sieciowy)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Użyj serwera do wspomagania systemu GPS (usuń zaznaczenie, aby zwiększyć wydajność systemu GPS)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Użyj funkcji Moja lokalizacja"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Informacje o telefonie"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Wyświetl informacje prawne, stan telefonu, wersję oprogramowania"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informacje prawne"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Nieznana"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sortuj według nazwy"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sortuj według rozmiaru"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Pokaż działające usługi"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Pokaż procesy z pam. pod."</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Zarządzaj rozmiarem"</string>
     <string name="filter" msgid="2018011724373033887">"Filtr"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Wybierz opcje filtru"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Wszystkie"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Pobrane"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Uruchomione"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"Na karcie SD"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Nośnik USB"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na karcie SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Wyłączone"</string>
     <string name="no_applications" msgid="5190227407135243904">"Brak aplikacji."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Pamięć wewn."</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Nośnik USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Pamięć karty SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Przeliczanie rozmiaru..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Usuń"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Wszystkie dane tej aplikacji zostaną trwale usunięte. Dotyczy to wszystkich plików, ustawień, kont, baz danych itd."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"wersja <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Przenieś"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Przenieś do telefonu"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Przenieś na kartę SD"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Przenieś na nośnik USB"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Przenieś na kartę SD"</string>
     <string name="moving" msgid="6431016143218876491">"Przenoszenie"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Brak wystarczającej ilości wolnego miejsca."</string>
     <string name="does_not_exist" msgid="837163572898468245">"Aplikacja nie istnieje."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferowana lokalizacja instalacji"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Zmień preferowaną lokalizację instalacji dla nowych aplikacji."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Użycie pamięci"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Wyświetl pamięć używaną przez aplikacje"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Uruchomione usługi"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Wyświetl i kontroluj obecnie uruchomione usługi"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Ponowne uruchamianie"</string>
+    <string name="cached" msgid="1059590879740175019">"Proces w tle z pamięci podręcznej"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Brak uruchomionych usług."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Uruchomiona przez aplikację."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"Dostępne: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"W użyciu <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"Wolne: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"Używane: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="memory" msgid="6609961111091483458">"Pamięć RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Procesów: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, usług: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Ustawienia"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Ta usługa została uruchomiona przez jej aplikację. Jej zatrzymanie może spowodować zakończenie działania aplikacji niepowodzeniem."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Nie można bezpiecznie zatrzymać tej aplikacji. Może to spowodować utratę części Twojej bieżącej pracy."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"To jest stary proces aplikacji zachowany dla zapewnienia lepszej szybkości w przypadku, gdyby był jeszcze potrzebny. Zwykle nie ma powodu, aby go zatrzymywać."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: aktualnie w użyciu. Dotknij opcji Ustawienia, aby nią sterować."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Główny proces będący w użyciu."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Usługa <xliff:g id="COMP_NAME">%1$s</xliff:g> jest w użyciu."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Dostawca <xliff:g id="COMP_NAME">%1$s</xliff:g> jest w użyciu."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Czy zatrzymać usługę systemową?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Czy na pewno chcesz zatrzymać tę usługę systemową? Jeśli tak, niektóre funkcje telefonu mogą przestać poprawnie działać do chwili jego wyłączenia i ponownego włączenia."</string>
     <string name="language_settings" msgid="502219872342167227">"Język i klawiatura"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ustawienia języka i klawiatury"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Ustawienia języka"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Ustawienia klawiatury"</string>
     <string name="phone_language" msgid="1165758957501090679">"Wybierz język"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Autokorekta"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Metoda wprowadzania"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Zarządzaj opcjami wprowadzania tekstu"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Ustawienia <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ustawienia klawiatury ekranowej"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Klawiatura urządzenia"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Ustawienia klawiatury wbudowanej"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Klawiatura wbudowana"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Ustawienia wbudowanej klawiatury fizycznej"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Dla programistów"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Ustaw opcje związane z programowaniem aplikacji"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debugowanie USB"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"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ż zapisywać w dzienniku działania w interfejsie użytkownika. Usługa pochodzi z aplikacji <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Czy skorzystać z tej usługi ułatwień dostępu?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Czy wyłączyć ułatwienia dostępu?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nie znaleziono aplikacji związanych z ułatwieniami dostępu"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nie zainstalowano żadnych aplikacji związanych z ułatwieniami dostępu."\n\n"Z usługi Android Market możesz pobrać czytnik ekranowy dla tego urządzenia."\n\n"Aby zainstalować czytnik ekranowy, kliknij przycisk OK."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Skrypty ułatwień dostępu"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Pobierz skrypty ułatwień dostępu"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Pozwala aplikacjom pobierać od Google skrypty ułatwień dostępu"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Niektóre aplikacje mogą pobierać od Google do telefonu skrypty ułatwiające dostęp do ich treści. Czy na pewno chcesz zezwolić Google na instalowanie w telefonie skryptów ułatwień dostępu?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Przycisk zasilania"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Koniec połączenia"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Naciśnięcie przycisku zasilania w trakcie połączenia powoduje jego zakończenie zamiast wyłączenia ekranu"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Ładowanie"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ekran włączony"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS włączony"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktywność"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Sygnał telefonu"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Czas aktywności urządzenia"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"WiFi na czas"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"WiFi na czas"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi na czas"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi na czas"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Szczegóły użycia baterii"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Szczegóły użycia"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor w działaniach pierwszoplanowych"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Utrzymuj aktywność"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Działanie Wi-Fi"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dane wysłane"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dane odebrane"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informacje o aplikacji"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Ustawienia aplikacji"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Ustawienia wyświetlacza"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Ustawienia WiFi"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Ustawienia Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Ustawienia Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Użycie baterii przez połączenia głosowe"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Użycie baterii przy nieaktywnym telefonie"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Zezwalaj aplikacjom na dostęp do bezpiecznych certyfikatów i innych danych logowania"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Wprowadź hasło"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Wprowadź hasło magazynu danych logowania."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Zainstaluj z karty SD"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Zainstaluj zaszyfrowane certyfikaty z karty SD"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Zainstaluj z nośnika USB"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Zainstaluj z karty SD"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Instaluj szyf. cer. z USB"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Zainstaluj zaszyfrowane certyfikaty z karty SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Ustaw hasło"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Ustaw lub zmień hasło magazynu danych logowania"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Wyczyść magazyn"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Tworzenie i przywracanie kopii zapasowej"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dane osobiste"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Utwórz kopię zapasową moich danych"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Utwórz kopię zapasową ustawień i innych danych aplikacji."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Utwórz na serwerach Google kopię zapasową danych aplikacji, haseł Wi-Fi oraz innych ustawień"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Autoprzywracanie"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"W przypadku ponownej instalacji aplikacji przywróć kopię zapasową ustawień lub innych danych."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"W przypadku ponownej instalacji aplikacji przywróć kopię zapasową ustawień lub innych danych"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Kopia zapasowa"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Czy na pewno chcesz zakończyć tworzenie kopii zapasowych ustawień i danych aplikacji oraz usunąć wszystkie kopie z serwerów Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Czy na pewno chcesz zakończyć tworzenie kopii zapasowych haseł Wi-Fi, zakładek oraz innych ustawień i danych aplikacji, a także usunąć wszystkie kopie z serwerów Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ustawienia administracji"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator urządzenia"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Dezaktywuj"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Odśwież listę"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Pomiń"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Dalej"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Trwa skanowanie sieci..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Dotknij, aby wybrać sieć"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Połącz z istniejącą siecią"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Wprowadź konfigurację sieci"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Połącz z nową siecią"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Łączenie..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Połączono"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Przejdź do następnego etapu"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"W tej chwili występują problemy z synchronizacją. Synchronizacja będzie możliwa wkrótce."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Dodaj konto"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Ogólne ustawienia synchronizacji"</string>
+    <string name="background_data" msgid="5779592891375473817">"Dane w tle"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplikacje mogą stale synchronizować, wysyłać i odbierać dane"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Uwaga"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Wyłączenie obsługi danych w tle wydłuża czas pracy baterii i ogranicza przesył danych. Niektóre aplikacje mogą nadal korzystać z połączenia transmisji danych w tle."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Autosynchronizacja"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikacje automatycznie synchronizują dane"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Zarządzaj kontami"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synchronizacja włączona"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchronizacja jest wyłączona"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Błąd synchronizacji"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index a344147..0e26567 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Estático"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desactivada"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d665660..0749479 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Desmontar cartão SD"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Formatar cartão SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Desmontar armaz. USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desmontar cartão SD"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Apagar armazenamento USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Apagar cartão SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Pequeno"</string>
     <string name="medium_font" msgid="2068475425515133701">"Médio"</string>
     <string name="large_font" msgid="599055175160971446">"Grande"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"Cartão SD"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Armazenamento USB"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Cartão SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Estado da bateria:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Ficha de alimentação:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Escala da bateria:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Morto"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Sobretensão"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erro desconhecido"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectável"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Detectável durante <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos…"</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Iniciar <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Conta:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Definições de proxy"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Definir o proxy HTTP global e as listas de exclusão"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Limpar"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Porta"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Não há proxy para"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar predefinições"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Concluído"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Nome de anfitrião"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atenção"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"O nome de anfitrião que introduziu não é válido."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"A lista de exclusão inserida não está formatada correctamente; introduza uma lista de domínios excluídos separados por vírgulas."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"É necessário preencher o campo referente à porta."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo referente à porta tem de estar vazio se o campo do anfitrião estiver vazio."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"A porta que introduziu não é válida."</string>
@@ -189,16 +189,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"As alterações terão efeito ao ligar novamente o cabo USB"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Activar armazenamento em massa USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total de bytes:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Nenhum cartão SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Armazenamento USB não montado"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Nenhum cartão SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bytes disponíveis:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"O cartão SD está a ser utilizado como um dispositivo de armazenamento em massa"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"Agora é seguro retirar o cartão SD"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"O cartão SD foi removido quando ainda estava em uso!"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Armaz. USB utilizado como disp. de armaz. em massa"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"O cartão SD está a ser utilizado como um dispositivo de armazenamento em massa"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Agora é seguro remover o arm. USB"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Agora é seguro retirar o cartão SD"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Armaz. USB removido ao ser utilizado!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"O cartão SD foi removido quando ainda estava em uso!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes utilizados:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"A procurar ficheiros multimédia no cartão SD..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"Cartão SD montado como só de leitura"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"A proc. multim. no armaz. USB…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"A procurar ficheiros multimédia no cartão SD..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Armaz. USB montado só leitura"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Cartão SD montado como só de leitura"</string>
+    <string name="skip_label" msgid="47510779345218297">"Ign."</string>
     <string name="next_label" msgid="4693520878012668114">"Seguinte"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Idioma"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Seleccionar actividade"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Informações da bateria"</string>
     <string name="display_label" msgid="7403874003169865762">"Visor"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Informações do telefone"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"Cartão SD"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Armazenamento USB"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Cartão SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Definições de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Definições"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Definições"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Definições"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo de voo"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Desactivar todas as ligações sem fios"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleccione um operador de rede"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Definir data, hora, fuso horário e formatos"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Data e hora automáticas"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilizar hora fornecida na rede"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utilizar hora fornecida na rede"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Fuso horário automático"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utilizar fuso horário fornecido na rede"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilizar fuso horário fornecido na rede"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Utilizar formato de 24 horas"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Definir hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar fuso horário"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por fuso horário"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Bloquear o dispositivo ao passar o tempo limite"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Ajustar o atraso antes de o dispositivo bloquear automaticamente"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Localização e segurança"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Definições de localização e segurança"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administração do dispositivo"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Seleccionar admins. dispos."</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Adicionar ou remover administradores do dispositivo"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Seleccionar admins. dispos."</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Adicionar ou remover administradores do dispositivo"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Definições de Bluetooth"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como telefone com altifalante"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorizar definições"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Utilizar Near Field Communication para ler e trocar etiquetas"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Definições de Wi-Fi"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ligar a uma rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer rede"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Configuração de rede"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Inserir PIN a partir de ponto de acesso"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID da rede"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anónima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Palavra-passe"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar palavra-passe"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Definições de IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(não alterado)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(não especificado)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Memorizado"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Desactivado"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora do alcance"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Seguro com <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Seguro com <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Protegido por <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS disponível)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, protegido com <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ligar"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Definições de IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Guardar"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancelar"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Introduza um endereço IP válido"</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Máscara de rede"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erro do hotspot Wi-Fi portátil"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Número de telefone, sinal, etc."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Desmontar cartão SD, ver armazenamento disponível"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Arm. partilhado e seguro"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Armazenamento"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Definições de armazenamento"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desmontar armazenamento USB, ver armazenamento disponível"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desmontar cartão SD, ver armazenamento disponível"</string>
     <string name="status_number" msgid="5123197324870153205">"O meu número de telefone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MINUTOS"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versão do PRL"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Indisponível"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo de actividade"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Hora de actividade"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Armazenamento interno do telefone"</string>
-    <string name="sd_memory" msgid="151871913888051515">"Cartão SD"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Armazenamento interno"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Armazenamento USB"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Cartão SD"</string>
     <string name="memory_available" msgid="418542433817289474">"Espaço disponível"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espaço total"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Desmontar cartão SD"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Desmontar o cartão SD para remoção segura"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desmont. arm. partilhado"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desmontar armaz. USB interno"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desmonte o cartão SD para removê-lo com segurança"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Activar o modo PTP"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Aparecer no USB como um dispositivo de câmara PTP em vez de como dispositivo MTP"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Inserir cartão SD para instalação"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Instalar cartão SD"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Instalar cartão SD"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Formatar cartão SD"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Formatar (apagar) o cartão SD"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Inser. armaz. USB para montagem"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Inserir cartão SD para instalação"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Montar armaz. partilhado"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Instalar cartão SD"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Montar o armaz. USB interno"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Instalar cartão SD"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Apagar armazenamento USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Apagar cartão SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Apaga todos os dados no armaz. USB interno do telemóvel, como músicas ou fotografias"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Apaga todos os dados do cartão SD do telemóvel, tais como músicas e fotografias"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Indisponível"</string>
     <string name="read_only" msgid="6702420168629076340">" (Só de leitura)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Desmontar cartão SD"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Se desmontar o cartão SD, algumas aplicações que estiver a utilizar serão paradas e poderão ficar indisponíveis até voltar a montar o cartão SD."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Falha ao desmontar o cartão SD"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Não é possível desmontar o cartão SD. Tente novamente mais tarde."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"O cartão SD será desmontado. Verifique o estado na área de notificação."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Desmontar armaz. USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Desmontar cartão SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Se desmontar o armazenamento USB, algumas aplicações que estiver a utilizar serão paradas e poderão ficar indisponíveis até voltar a montar o armazenamento USB."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Se desmontar o cartão SD, algumas aplicações que estiver a utilizar serão paradas e poderão ficar indisponíveis até voltar a montar o cartão SD."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Falha ao desmontar armaz. USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Falha ao desmontar o cartão SD"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Não é possível desmontar o armazenamento USB. Tente novamente mais tarde."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Não é possível desmontar o cartão SD. Tente novamente mais tarde."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"O armazenamento USB será desmontado."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"O cartão SD será desmontado."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"A desmontar"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontagem em curso"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado da bateria"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Reposição de predefinições de APN concluída"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Reposição dos dados de fábrica"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Apaga todos os dados do telefone"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Esta operação eliminará todos os dados do telefone, incluindo:"\n<li>"A sua Conta Google"</li>\n<li>"Definições e dados do sistema e das aplicações"</li>\n<li>"Aplicações transferidas"</li>\n"Não eliminará:"\n<li>"Software do sistema actual e aplicações agregadas"</li>\n<li>"Ficheiros do cartão SD, tais como música ou fotografias"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Esta operação apagará todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:"\n\n<li>"A sua conta Google"</li>\n<li>"Definições e dados do sistema e das aplicações"</li>\n<li>"Aplicações transferidas"</li>\n\n"Para apagar todos os dados deste telemóvel, é necessário apagar o "<b>"armazenamento USB"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Esta operação apagará todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:"\n\n<li>"A sua conta Google"</li>\n<li>"Definições e dados do sistema e das aplicações"</li>\n<li>"Aplicações transferidas"</li>\n\n"Para apagar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Apagar cartão SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Apaga todos os dados no armaz. USB interno do telemóvel, tais como músicas ou fotografias."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Apaga todos os dados do cartão SD do telemóvel, como músicas e fotografias."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Repor telefone"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Apagar todas as informações pessoais e as aplicações transferidas? Não é possível reverter esta acção!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenhe o seu padrão de desbloqueio"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Tem de desenhar o seu padrão de desbloqueio para confirmar uma reposição do telefone."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Não  foi efectuada nenhuma reposição porque o serviço System Clear não está disponível."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Formatar cartão SD."</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Apaga todos os dados do cartão SD"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"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" msgid="370856400090190151">"Formatar cartão SD"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Formatar cartão SD, apagando todos os seus dados multimédia? Não é possível reverter a acção!"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Apagar armazenamento USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Apagar cartão SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Apaga todos dados armaz. USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Apaga todos os dados do cartão SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Esta acção apagará o armazenamento USB. Perderá "<b>"todos"</b>" os dados aí armazenados!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Esta acção irá apagar o cartão SD. Perderá "<b>"todos"</b>" os dados do cartão!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Apagar armazenamento USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Apagar cartão SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Apagar armazenamento USB e apagar todos os ficheiros armazenados? Não é possível reverter a acção!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Apagar cartão SD e apagar todos os ficheiros armazenados? Não é possível reverter a acção!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Apagar tudo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenhe o seu padrão de desbloqueio"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Tem de efectuar o padrão de desbloqueio para confirmar a formatação de um cartão SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Tem de desenhar a sequência de desbloqueio para confirmar que pretende formatar o armazenamento USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Tem de desenhar a sequência de desbloqueio para confirmar que pretende apagar o cartão SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Definições de chamadas"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar correio de voz, reencaminhamento de chamadas, chamada em espera, ID do autor da chamada"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ligação USB"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Erro na ligação Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Não é possível ligar mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Definições de ligação ponto a ponto de Bluetooth"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Seleccionar aparelhos Bluetooth para efectuar ligação ponto a ponto"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Definir opções de roaming, redes, APNs"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS assistido"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar o servidor para auxiliar o GPS (desmarque esta opção para reduzir a utilização da rede)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar o servidor para auxiliar o GPS (desmarque esta opção para melhorar o desempenho do GPS)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Utilizar A minha localização"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Acerca do telefone"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Ver informações jurídicas, estado do telefone, versão de software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Desconhecido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordenar pelo nome"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamanho"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Mostrar serv. em execução"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Mostrar proc. em cache"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerir espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Seleccionar opções de filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todas"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Transferidas"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Em execução"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"No cartão SD"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"No cartão SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desactivada"</string>
     <string name="no_applications" msgid="5190227407135243904">"Sem aplicações."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Armaz. interno"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Armaz. USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Arm. cartão SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"A recalcular tamanho..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Eliminar"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Todos os dados desta aplicação serão eliminados definitivamente. Isto inclui todos os ficheiros, definições, contas, bases de dados, entre outros."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"versão <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Mover para o telefone"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Mover para cartão SD"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover para armaz. USB"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover para cartão SD"</string>
     <string name="moving" msgid="6431016143218876491">"A mover"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Não existe armazenamento suficiente restante."</string>
     <string name="does_not_exist" msgid="837163572898468245">"A aplicação não existe."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Localização de instalação preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Alterar a localização de instalação preferida para novas aplicações."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilização do armazenam."</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Ver o armazenamento utilizado pelas aplicações"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Ver e controlar os serviços actualmente em execução"</string>
     <string name="service_restarting" msgid="2242747937372354306">"A reiniciar"</string>
+    <string name="cached" msgid="1059590879740175019">"Processo em segundo plano em cache"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Nada a ser executado."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Iniciado pela aplicação."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> disponível"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> em utilização"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> gratuito"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> utiliz."</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviço"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Definições"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Este serviço foi iniciado pela aplicação. Se o parar, a aplicação pode falhar."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Esta aplicação não pode ser parada com segurança. Se o fizer, poderá perder algum do seu trabalho actual."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Trata-se de um processo de aplicações antigo que se tem mantido para aumentar a velocidade caso seja necessário. Normalmente, não existe motivo para pará-lo."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: actualmente em utilização. Toque em Definições para o controlar."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Processo principal que está a ser utilizado."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"O serviço <xliff:g id="COMP_NAME">%1$s</xliff:g> está a ser utilizado."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"O fornecedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está a ser utilizado."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Parar serviço de sistema?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Tem a certeza de que pretende parar este serviço do sistema? Se o fizer, algumas das funcionalidades do telemóvel poderão deixar de funcionar correctamente até desligá-lo e ligá-lo novamente."</string>
     <string name="language_settings" msgid="502219872342167227">"Idioma e teclado"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Definições de idioma e teclado"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Definições de idioma"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Definições do teclado"</string>
     <string name="phone_language" msgid="1165758957501090679">"Seleccionar idioma"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Substituir automaticamente"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Método de entrada"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gerir opções de entrada de texto"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Definições de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Definições do teclado no ecrã"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Teclado do dispositivo"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Definições do teclado incorporado"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Teclado incorporado"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Definições do teclado físico incorporado"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Desenvolvimento"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Definir opções de desenvolvimento da aplicação"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Este serviço de acessibilidade pode captar todo o texto que escrever, incluindo dados pessoais e números de cartões de crédito, com excepção de palavras-passe. Também pode registar as interacções com a interface do utilizador. O serviço é fornecido com a aplicação <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Utilizar este serviço de acessibilidade?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Desactivar acessibilidade?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Não foram encontradas aplicações relacionadas com acessibilidade"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Não tem nenhuma aplicação relacionada com acessibilidade instalada."\n\n"Pode transferir um leitor de ecrã para o aparelho a partir do Android Market."\n\n"Clique em OK para instalar o leitor de ecrã."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Scripts de acessibilidade"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Transferir scripts de acessibilidade"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Permitir que as aplicações transfiram scripts de acess. do Google"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Para que o seu conteúdo seja mais acessível, algumas aplicações podem solicitar ao Google que transfira scripts para o telefone. Tem a certeza de que pretende permitir que o Google instale scripts de acessibilidade no seu telefone?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Botão de ligar/desligar"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"O botão de ligar/desligar termina a chamada"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Durante uma chamada, premir o botão de ligar/desligar termina a chamada em vez de desligar o ecrã"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"A carregar"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ecrã activo"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activado"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Despertar"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Sinal telefónico"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Hora de activação do dispositivo"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"tempo de ligação WiFi"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"tempo de ligação WiFi"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Tempo de ligação Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Tempo de ligação Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Detalhes da utilização da bateria"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Utilizar detalhes"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"primeiro plano da CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Manter desperto"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi em execução"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Telefone"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dados enviados"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dados recebidos"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informações da aplicação"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Definições da aplicação"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Definições do visor"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Definições WiFi"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Definições de Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Definições de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria utilizada por chamadas de voz"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Bateria utilizada quando o telefone está inactivo"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Acesso das aplicações a certificados seguros e outras credenciais"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introduzir palavra-passe"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Introduza a palavra-passe do armazenamento de credenciais."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Instalar a partir do cartão SD"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Instalar certificados encriptados a partir do cartão SD"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalar do armaz. USB"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalar a partir do cartão SD"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Instalar certif. de encriptação a partir do armaz. USB"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instalar certificados encriptados a partir do cartão SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Definir palavra-passe"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Definir ou alterar a palavra-passe do armazenamento de credenciais"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Limpar armazenamento"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Cópia de segurança e restauro"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dados pessoais"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Fazer uma cópia de segurança dos meus dados"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Fazer uma cópia de segurança das definições e de outros dados da aplicação."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Fazer cópia de segurança dos dados da aplicação, palavras-passe de Wi-Fi e outras definições relativas aos servidores da Google"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauro automático"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Se eu reinstalar uma aplicação, restaurar as definições guardadas numa cópia de segurança ou outros dados."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Se eu reinstalar uma aplicação, restaurar as definições guardadas numa cópia de segurança ou outros dados"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Cópia de segurança"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Tem a certeza de que pretende parar a cópia de segurança das definições e dos dados da aplicação e apagar todas as cópias nos servidores da Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Tem a certeza de que pretende parar a cópia de segurança das palavras-passe, marcadores e outros dados de definições e de aplicações de Wi-Fi e apagar todas as cópias nos servidores da Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Definições de administração do dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador do dispositivo"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Desactivar"</string>
@@ -1200,43 +1259,32 @@
     <string name="sound_category_calls_title" msgid="3688531959256239012">"Chamadas recebidas"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificações"</string>
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"Comentários"</string>
-    <string name="wifi_setup_title" msgid="3130584822275278425">"Configuração Wi-Fi "</string>
+    <string name="wifi_setup_title" msgid="3130584822275278425">"Configuração Wi-Fi"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Não ligada"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adicionar rede"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualizar lista"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignorar"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Seguinte"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"A procurar redes..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Tocar para seleccionar rede"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Ligar a uma rede já existente"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Inserir configuração de rede"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Ligar a uma nova rede"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"A ligar..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Ligada"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Continue para o passo seguinte"</string>
     <!-- no translation found for sync_is_failing (1591561768344128377) -->
     <skip />
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Adicionar conta"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Def. gerais de sincronização"</string>
+    <string name="background_data" msgid="5779592891375473817">"Dados em segundo plano"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplic. podem sincr., enviar/receber dados a qualq. momento"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Atenção"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"A desactivação de dados em segundo plano economiza a bateria e reduz a utilização de dados. Algumas aplicações podem continuar a utilizar a ligação de dados em segundo plano."</string>
     <!-- no translation found for sync_automatically (7558810110682562376) -->
     <skip />
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"As aplicações sincronizam os dados automaticamente"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Gerir contas"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sincron. activada"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"A sincronização está desactivada"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Erro de sincron."</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index bf65834..8c2523b 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Estático"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desativado"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2b6b3fe..a58e050 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Desmontar cartão SD"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Formatar cartão SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Desconectar armaz. USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desmontar cartão SD"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Apagar armazenamento USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Apagar cartão SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Pequeno"</string>
     <string name="medium_font" msgid="2068475425515133701">"Médio"</string>
     <string name="large_font" msgid="599055175160971446">"Grande"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"Cartão SD"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Armaz. USB"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Cartão SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Status da bateria:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Tomada de alimentação:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Escala da bateria:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Descarregada"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Sobretensão"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erro desconhecido"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectável"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Detectável por <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos…"</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Iniciar <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Conta:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Configurações de proxy"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Define o proxy HTTP geral e as listas de exclusão"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Limpar"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Porta"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Não há nenhum proxy para"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar padrões"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Concluído"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Nome do host"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atenção"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"O nome de host digitado não é válido."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"A lista de exclusão digitada não está formatada corretamente. Insira uma lista dos domínios excluídos separados por vírgula."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Você deve completar o campo de porta."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo da porta deverá estar vazio se o campo do host estiver vazio."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"A porta digitada não é válida."</string>
@@ -189,16 +189,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"As alterações são aplicadas quando o cabo USB é reconectado."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Ativar o armazenamento USB em massa"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total de bytes:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Nenhum cartão SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Armazenam. USB não conectado"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Nenhum cartão SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bytes disponíveis:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"O cartão SD está sendo usado como um dispositivo de armazenamento em massa."</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"O cartão SD já pode ser removido com segurança."</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"O cartão SD foi removido enquanto ainda estava em uso!"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Arm. USB usado p/ arm. massa"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"O cartão SD está sendo usado como um dispositivo de armazenamento em massa."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Armaz. USB pode ser removido"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"O cartão SD já pode ser removido com segurança."</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Armaz. USB removido em uso!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"O cartão SD foi removido enquanto ainda estava em uso!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes usados:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Procurando mídia no cartão SD…"</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"Cartão SD montado como somente leitura"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Procurando mídia armaz. USB..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Procurando mídia no cartão SD…"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Armaz. USB é somente leitura"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Cartão SD montado como somente leitura"</string>
+    <string name="skip_label" msgid="47510779345218297">"Pular"</string>
     <string name="next_label" msgid="4693520878012668114">"Avançar"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Idioma"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Selecionar atividade"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Informações da bateria"</string>
     <string name="display_label" msgid="7403874003169865762">"Tela"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Informações do telefone"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"Cartão SD"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Armaz. USB"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Cartão SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configurações de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Configurações"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Configurações"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo para avião"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Desativar todas as conexões sem fio"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Selecione um operador de rede"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Definir data, hora, fuso horário e formatos"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Data e hora automáticas"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar horário fornecido pela rede"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usar horário fornecido pela rede"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Fuso horário automático"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar fuso horário fornecido pela rede"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar fuso horário fornecido pela rede"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Formato de 24 horas"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Definir data e hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Selecionar fuso horário"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Classificar por fuso horário"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Bloquear o dispositivo após o tempo limite"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Ajustar o atraso antes do bloqueio automático do dispositivo"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Local e segurança"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Configurações de local e segurança"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administração do dispositivo"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Selecionar administradores"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Adicionar ou remover administradores do dispositivo"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Selecionar administradores"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Adicionar ou remover administradores do dispositivo"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ativar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Conf. de Bluetooth"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como viva-voz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e mídia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configurações"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Usar comunicação a curta distância para ler e trocar tags"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Ativar Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Configurações de Wi-Fi"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar-se à rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer a rede"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Configuração da rede"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Inserir o pin do ponto de acesso"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID da rede"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anônima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Senha"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar senha"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Configurações de IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(não alterado)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(não especificado)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Lembrado"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Desativado"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Não está dentro do alcance"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Protegido por <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Protegido por <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Protegido com <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (disponível em WPS)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, protegido por <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Configurações de IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Salvar"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancelar"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Digite um endereço IP válido."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Máscara de rede"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Ponto de acesso Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Ponto de acesso portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ativo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erro de ponto de acesso Wi-Fi portátil"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Número de telefone, sinal etc."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Desmontar o cartão SD, visualizar armazenamento disponível"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Armaz. compart. e seguro"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Armazenamento"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Configurações de armazenamento"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desconectar armazenamento USB, ver armazenamento disponível"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desmontar o cartão SD, visualizar armazenamento disponível"</string>
     <string name="status_number" msgid="5123197324870153205">"Meu número de telefone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versão PRL"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Não disponível"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo de atividade"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo de ativação"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Armazenamento interno do telefone"</string>
-    <string name="sd_memory" msgid="151871913888051515">"Cartão SD"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Armazenamento interno"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Armaz. USB"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Cartão SD"</string>
     <string name="memory_available" msgid="418542433817289474">"Espaço disponível"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espaço total"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Desmontar cartão SD"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Desmontar o cartão SD para remoção segura"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desconectar armaz. comp."</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desconectar armaz. USB interno"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desconecte o cartão SD para poder removê-lo com segurança"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Ativar o modo PTP"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Aparece no USB como um dispositivo de câmera PTP em vez de um dispositivo MTP"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Insira um cartão SD para conexão"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Conectar cartão SD"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Conectar o cartão SD"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Formatar cartão SD"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Formatar (apagar) o cartão SD"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Insira armazen. USB"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insira um cartão SD para conexão"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Conectar armaz. compart."</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Conectar cartão SD"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Conectar armaz. USB interno"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Conectar o cartão SD"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Apagar armazenamento USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Apagar cartão SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Ap. arm. USB, como mús. e fot."</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Apaga todos os dados do cartão SD do telefone, como músicas e fotos"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Não disponível"</string>
     <string name="read_only" msgid="6702420168629076340">" (Somente leitura)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Desconectar cartão SD"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Se você desconectar o cartão SD, alguns aplicativos que estão em uso serão interrompidos e podem não estar disponíveis até você conectar o cartão SD novamente."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Falha ao desconectar cartão SD"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Não é possível desconectar o cartão SD. Tente novamente mais tarde."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"O cartão SD será desconectado. Verifique a área de notificação para saber o status."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Desconectar armaz. USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Desconectar cartão SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Se você desconectar o armazenamento USB, alguns aplicativos que estão em uso serão interrompidos e podem não estar disponíveis até você conectar o armazenamento USB novamente."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Se você desconectar o cartão SD, alguns aplicativos que estão em uso serão interrompidos e podem não estar disponíveis até você conectar o cartão SD novamente."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Falha ao descon. armaz. USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Falha ao desconectar cartão SD"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Não é possível desconectar o armazenamento USB. Tente novamente mais tarde."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Não é possível desconectar o cartão SD. Tente novamente mais tarde."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"O armazenamento USB será desconectado."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"O cartão SD será desconectado."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desconectando"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desconexão em andamento"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status da bateria"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Redefinição das configurações padrão do APN concluída"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Configuração original"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Apaga todos os dados no telefone"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Todos os dados do seu telefone serão apagados, incluindo:"\n<li>"Sua conta do Google"</li>\n<li>"Configurações e dados de aplicativos e do sistema"</li>\n<li>"Aplicativos que você fez download"</li>\n"Não serão apagados:"\n<li>"Aplicativos fornecidos e o software atual do sistema"</li>\n<li>"Arquivos do cartão SD, como música ou fotos"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Isso apagará todos os dados do "<b>"armazenamento interno"</b>" do seu telefone, incluindo:"\n\n<li>"Sua conta do Google"</li>\n<li>"Dados e configurações do sistema e de aplicativos"</li>\n<li>"Aplicativos baixados"</li>\n\n"Para apagar todos os dados deste telefone, o "<b>"armazenamento USB"</b>" deve ser apagado."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Isso apagará todos os dados do "<b>"armazenamento interno"</b>" do seu telefone, incluindo:"\n\n<li>"Sua conta do Google"</li>\n<li>"Dados e configurações do sistema e de aplicativos"</li>\n<li>"Aplicativos baixados"</li>\n\n"Para apagar músicas, imagens e outros dados do usuário, o "<b>"cartão SD"</b>" deve ser apagado."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Apagar cartão SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Ap. arm. USB, como mús. e fot."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Ap. cart. SD, como mús. e fot."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Redefinir telefone"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Apagar todas as informações pessoais e os aplicativos dos quais você fez download? É impossível reverter essa ação."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenhe o seu padrão de desbloqueio"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Você precisa desenhar o seu padrão de desbloqueio para confirmar uma redefinição de telefone."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Formatar cartão SD."</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Apaga todos os dados no cartão SD"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"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" msgid="370856400090190151">"Formatar cartão SD"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Formatar cartão SD, apagando toda a sua mídia? A ação não pode ser revertida!"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Apagar armazenamento USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Apagar cartão SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Apaga dados do armazen. USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Apaga todos os dados no cartão SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Esta ação apagará o armazenamento USB. Você perderá "<b>"todos"</b>" os dados armazenados!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Esta ação apagará o cartão SD. Você perderá "<b>"todos"</b>" os dados do cartão!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Apagar armazenamento USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Apagar cartão SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Apagar o armazenamento USB, apagando todos os arquivos armazenados? A ação não pode ser revertida!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Apagar cartão SD, apagando todos os arquivos armazenados? A ação não pode ser revertida!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Apagar tudo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenhe o seu padrão de desbloqueio"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Você deve desenhar o seu padrão de desbloqueio para confirmar a formatação de um cartão SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Você deve desenhar sua sequência de desbloqueio para confirmar que deseja apagar o armazenamento USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Você deve desenhar sua sequência de desbloqueio para confirmar que deseja apagar o cartão SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Conf. de chamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar correio voz, encaminhamento, espera etc."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Vínculo USB"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Erro ao vincular Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Não é possível vincular a mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será vinculado."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Configurações de vínculo Bluetooth"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Selecione os aparelhos Bluetooth a serem vinculados"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Definir opções para roaming, redes, APNs"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Usar GPS associado"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Usar servidor para auxiliar GPS (desmarque para reduzir o uso da rede)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Usar servidor para auxiliar GPS (desmarque para aprimorar o desempenho do GPS)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Usar Meu Local"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Sobre o telefone"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Ver informações legais, status do telefone, versão do software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Desconhecido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Classificar por nome"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Classificar por tamanho"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Mostrar serviços em exec."</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Mostrar processo em cache"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Selecionar as opções de filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todos"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Download concluído"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Em execução"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"No cartão SD"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"No cartão SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desativado"</string>
     <string name="no_applications" msgid="5190227407135243904">"Nenhum aplicativo."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Armaz. interno"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Armaz. USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Armaz. cart. SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Recalculando o tamanho…"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Excluir"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Todos os dados deste aplicativo serão excluídos permanentemente. Isso inclui todos os arquivos, configurações, contas, bancos de dados e outros."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"versão <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Mover para telefone"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Mover para cartão SD"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover para armaz. USB"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover para cartão SD"</string>
     <string name="moving" msgid="6431016143218876491">"Movendo"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Não há espaço de armazenamento suficiente disponível."</string>
     <string name="does_not_exist" msgid="837163572898468245">"O aplicativo não existe."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Local de instalação preferido"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Alterar o local de instalação preferido para novos aplicativos."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso do armazenamento"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Visualizar armazenamento usado pelos aplicativos"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Visualizar e controlar os serviços em execução no momento"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Reiniciando"</string>
+    <string name="cached" msgid="1059590879740175019">"Processo em segundo plano em cache"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Nada em execução."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Iniciado pelo aplicativo."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> disponível"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> em uso"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> grat."</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> usada"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviço"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Configurações"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Este serviço foi iniciado pelo aplicativo correspondente. Interrompê-lo pode provocar a falha do aplicativo."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Este aplicativo não pode ser interrompido com segurança. Isso poderia resultar na perda do seu trabalho atual."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Este é um processo antigo do aplicativo que está sendo mantido para obter melhor velocidade caso seja necessário novamente. Geralmente não há motivos para interrompê-lo."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: em uso no momento. Toque em Configurações para controlá-lo."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"O processo principal que está em uso."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"O serviço <xliff:g id="COMP_NAME">%1$s</xliff:g> está em uso."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"O provedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está em uso."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Interromper o serviço do sistema?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Tem certeza de que deseja interromper este serviço do sistema? Se o fizer, alguns recursos do seu telefone podem parar de funcionar corretamente até que você o desligue e ligue novamente."</string>
     <string name="language_settings" msgid="502219872342167227">"Idioma e teclado"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Configurações de idioma e teclado"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Configurações de idioma"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Configurações do teclado"</string>
     <string name="phone_language" msgid="1165758957501090679">"Selecionar idioma"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Substituição automática"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Método de entrada"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gerenciar opções de entrada de texto"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configurações de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configurações do teclado virtual"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Teclado do dispositivo"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Configurações de teclado integrado"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Teclado integrado"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Configurações do teclado físico integrado"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Desenvolvimento"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Define as opções para o desenvolvimento do aplicativo"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Este serviço de acessibilidade pode coletar todo o texto que você digitar, incluindo dados pessoais e números de cartão de crédito, menos senhas. Ele também pode registrar as interações da interface do usuário. Ele é proveniente do aplicativo <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Usar este serviço de acessibilidade?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Desativar acessibilidade?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nenhum aplicativo relacionado à acessibilidade encontrado."</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Você não tem nenhum aplicativo relacionado à acessibilidade instalado."\n\n"Você pode fazer o download de um leitor de tela para o seu aparelho no Android Market."\n\n"Clique em OK para instalar o leitor de tela."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Scripts de acessibilidade"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Download de scripts de acessibilidade"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Permitir download de scripts de acess. do Google pelo aplicativo"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Alguns aplicativos podem pedir ao Google para fazer o download de scripts para o seu telefone para tornar o conteúdo mais acessível. Tem certeza de que deseja permitir que o Google instale scripts de acessibilidade no seu telefone?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Botão Liga/desliga"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Botão Liga/desliga encerra a chamada"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Durante uma chamada, pressionar o botão Liga/desliga encerra a chamada em vez de desativar a tela."</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Carregando"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Tela ativada"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ligado"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"WIFI"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Ativo"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Sinal do celular"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Tempo de ativação do aparelho"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"Tempo de ativação da rede WiFi"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"Tempo de ativação da rede WiFi"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Tempo de ativação da rede Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Tempo de ativação da rede Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Detalhes de uso da bateria"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalhes de uso"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Permanecer ativo"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi em execução"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Telefone"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dados enviados"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dados recebidos"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informações do aplicativo"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Configurações de aplicativos"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Configurações da tela"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Configurações de WiFi"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Configurações de Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Conf. de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria usada por chamadas de voz"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Bateria usada quando o telefone está ocioso"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Permitir que os aplicativos acessem credenciais e certificados seguros"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Inserir senha"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Insira a senha do armazenamento de credenciais."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Instalar do cartão SD"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Instalar certificados criptografados do cartão SD"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalar do armaz. USB"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalar do cartão SD"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Inst. cert. crip. do arm."</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instalar certificados criptografados do cartão SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Definir senha"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Definir ou alterar a senha do armazenamento de credenciais"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Limpar armazenamento"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Backup e restauração"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dados pessoais"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Fazer backup dos meus dados"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Fazer backup das minhas configurações e de outros dados do aplicativo."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Dados de aplicativos de backup, senhas da rede Wi-Fi e outras configurações nos servidores do Google"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauração automática"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Caso o aplicativo seja reinstalado, restaurar as configurações ou outros dados de backup."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Caso o aplicativo seja reinstalado, restaurar as configurações ou outros dados de backup"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Backup"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Tem certeza de que deseja parar de fazer backup das suas configurações e dados de aplicativo e apagar todas as cópias nos servidores do Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Tem certeza de que deseja parar de fazer backup das suas senhas da rede Wi-Fi, dos favoritos e de outras configurações e dados de aplicativo e apagar todas as cópias nos servidores do Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configurações de administração do dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador do dispositivo"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Desativar"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Atualizar lista"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignorar"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Avançar"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Verificando redes..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Toque para selecionar a rede"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conectar-se à rede existente"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Inserir configuração da rede"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Conectar-se à nova rede"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Conectando..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Conectado"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Prosseguir para próxima etapa"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"A sincronização está enfrentando problemas no momento. Ela retornará em breve."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Adicionar conta"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Configurações de sinc. geral"</string>
+    <string name="background_data" msgid="5779592891375473817">"Dados de segundo plano"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplicat. sincronizam, enviam e recebem dados a qualquer hora"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Atenção"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"A desativação dos dados de segundo plano estende a vida útil da bateria e diminui o uso dos dados. Alguns aplicativos ainda podem usar a conexão de dados de segundo plano."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Sincronização automática"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplicativos sincronizam dados automaticamente"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Gerenciar contas"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"A sinc. está ATIVADA"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"A sincronização está DESATIVADA"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Erro na sinc."</string>
 </resources>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 99d0710..571a7a6 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -142,9 +142,12 @@
   </string-array>
     <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
     <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
+    <!-- no translation found for wifi_network_setup:2 (7131487972018976724) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
     <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
     <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Deactivà"</item>
     <item msgid="3165868966179561687">"Avis"</item>
@@ -161,7 +164,5 @@
     <item msgid="3738430123799803530">"Carta SD che po vegnir barattada"</item>
     <item msgid="4498124044785815005">"Laschar decider il sistem"</item>
   </string-array>
-    <!-- no translation found for vibrate_entries:1 (6293147072807231256) -->
-    <!-- no translation found for vibrate_entries:2 (1276641209451816572) -->
     <!-- no translation found for vibrate_entries:3 (8418930333779132418) -->
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index d952ea7..1fa857e 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"ASU"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Retrair la carta SD"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Formatar la carta SD"</string>
+    <!-- outdated translation 3364184561355611897 -->     <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Retrair la carta SD"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Retrair la carta SD"</string>
+    <!-- outdated translation 362497552060004057 -->     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Formatar la carta SD"</string>
+    <!-- outdated translation 362497552060004057 -->     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Formatar la carta SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Pitschen"</string>
     <string name="medium_font" msgid="2068475425515133701">"Mesaun"</string>
     <string name="large_font" msgid="599055175160971446">"Grond"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"Carta SD"</string>
+    <!-- outdated translation 5922637503871474866 -->     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Carta SD"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Carta SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Status dal accu:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Colliaziun cun il conduct electric:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Scala da l\'accu:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Vid"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Surtensiun"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Errur nunenconuschenta"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Visibel"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Visibel durant <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secundas…"</string>
@@ -139,8 +144,7 @@
     <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
     <skip />
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar il standard"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <!-- outdated translation 477348175123635416 -->     <string name="proxy_action_text" msgid="2957063145357903951">"Memorisar"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Num da host"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Attenziun"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
@@ -189,28 +193,36 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Las modificaziuns vegnan ad avair effect sch\'il cabel USB vegn connectà la proxima giada."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Activar la memoria da massa USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Bytes en total:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Nagina carta SD"</string>
+    <!-- outdated translation 6666688653496819947 -->     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Nagina carta SD"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Nagina carta SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bytes disponibels:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"La carta SD vegn utilisada sco memoria da massa"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"La carta SD po ussa vegnir allontanada."</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"La carta SD è vegnida retratga durant l\'utilisaziun!"</string>
+    <!-- outdated translation 4786433969313661655 -->     <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"La carta SD vegn utilisada sco memoria da massa"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"La carta SD vegn utilisada sco memoria da massa"</string>
+    <!-- outdated translation 3812022095683863087 -->     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"La carta SD po ussa vegnir allontanada."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"La carta SD po ussa vegnir allontanada."</string>
+    <!-- outdated translation 5145797653495907970 -->     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"La carta SD è vegnida retratga durant l\'utilisaziun!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La carta SD è vegnida retratga durant l\'utilisaziun!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes utilisads:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Tschertgar datotecas da multimedia sin la carta SD…"</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"Carta SD montada mo per lectura"</string>
+    <!-- outdated translation 2763464949274455656 -->     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Tschertgar datotecas da multimedia sin la carta SD…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Tschertgar datotecas da multimedia sin la carta SD…"</string>
+    <!-- outdated translation 5706115860484118911 -->     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Carta SD montada mo per lectura"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Carta SD montada mo per lectura"</string>
     <!-- no translation found for skip_label (47510779345218297) -->
     <skip />
     <string name="next_label" msgid="4693520878012668114">"Vinavant"</string>
-    <!-- no translation found for language_picker_title (5349877711342869319) -->
-    <skip />
+    <!-- outdated translation 4034157617842965844 -->     <string name="language_picker_title" msgid="5349877711342869319">"Lingua"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Tscherner in\'acziun"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Infurmaziuns da l\'apparat"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Infurmaziuns da l\'accu"</string>
     <string name="display_label" msgid="7403874003169865762">"Visur"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Infos davart il telefon"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"Carta SD"</string>
+    <!-- outdated translation 5743100901106177102 -->     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Carta SD"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Carta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Parameters proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Interrumper"</string>
     <string name="settings_label" msgid="1626402585530130914">"Parameters"</string>
+    <!-- no translation found for settings_label_launcher (8344735489639482340) -->
+    <skip />
     <string name="settings_shortcut" msgid="3672145147925639262">"Parameters"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modus d\'aviun"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Deactivar tut las connexiuns senza fil"</string>
@@ -230,12 +242,9 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Tscherner in purschider da rait"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data ed ura"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"\"Configurar la data, il temp, la zona d\'urari ed ils formats\""</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
+    <!-- outdated translation 3086083265745944725 -->     <string name="date_time_auto" msgid="7076906458515908345">"Automaticamain"</string>
+    <!-- outdated translation 9034585614665299846 -->     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilisar las valurs messas a disposiziun da la rait"</string>
+    <!-- outdated translation 3900356736797266448 -->     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utilisar las valurs da la rait"</string>
     <!-- no translation found for zone_auto (334783869352026648) -->
     <skip />
     <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
@@ -253,6 +262,10 @@
     <skip />
     <!-- no translation found for lock_after_timeout_summary (5751027735105958453) -->
     <skip />
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Lieu e segirezza"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Parameters da segirezza e localisaziun"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"\"Definir ils parameters da Mia posiziun, da la debloccada dal visur, da la bloccada da la carta SIM e da la bloccada da la memoria da las infurmaziuns d\'annunzia\""</string>
@@ -272,18 +285,12 @@
     <skip />
     <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
     <skip />
-    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
-    <skip />
+    <!-- outdated translation 1896502750816432974 -->     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Crear in schema da debloccaziun"</string>
+    <!-- outdated translation 1235339327020445576 -->     <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Per debloccar stuais Vus dissegnar in schema."</string>
+    <!-- outdated translation 2206721045699671063 -->     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Definir il PIN per debloccar"</string>
+    <!-- outdated translation 3898840802187521463 -->     <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Per debloccar è in PIN numeric necessari"</string>
+    <!-- outdated translation 2410408982973923603 -->     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Definir il pled-clav da debloccaziun"</string>
+    <!-- outdated translation 4711043487823726994 -->     <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Per debloccar vegn dumandà in pled-clav."</string>
     <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
     <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Deactivar la bloccada dal visur"</string>
@@ -295,8 +302,7 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Midar il pled-clav da debloccaziun"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Il pled-clav sto cuntegnair almain %d caracters."</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN sto cuntegnair almain %d caracters."</string>
-    <!-- no translation found for lockpassword_press_continue (122706614386757182) -->
-    <skip />
+    <!-- outdated translation 6506047902828925216 -->     <string name="lockpassword_press_continue" msgid="122706614386757182">"\"Tscherni \"\"Vinavant\"\", sche Vus essas a fin.\""</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Vinavant"</string>
     <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Il PIN dastga cuntegnair maximalmain %d caracters."</string>
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Il PIN dastga sin il pli cuntegnair %d segns."</string>
@@ -324,8 +330,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Interrumper"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administraziun dals apparats"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Tscherner ils administraturs da l\'apparat"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Agiuntar u allontanar administraturs dad apparats"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Tscherner ils administraturs da l\'apparat"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Agiuntar u allontanar administraturs dad apparats"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Parameters bluetooth"</string>
@@ -391,6 +397,13 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sco telefon ad autpledader"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorisar ils parameters"</string>
+    <!-- no translation found for nfc_quick_toggle_title (6769159366307299004) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_summary (1988408027741447231) -->
+    <skip />
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WLAN"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar WLAN"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Parameters WLAN"</string>
@@ -414,6 +427,10 @@
     <skip />
     <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
     <skip />
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
+    <skip />
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
+    <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID da la rait"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segirezza"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensitad dal signal"</string>
@@ -428,8 +445,7 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitad"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitad anonima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Pled-clav"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
+    <!-- outdated translation 4235237470701732009 -->     <string name="wifi_show_password" msgid="6461249871236968884">"Mussar il pled-clav"</string>
     <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
     <skip />
     <string name="wifi_unchanged" msgid="3410422020930397102">"(betg modifitgà)"</string>
@@ -437,6 +453,8 @@
     <string name="wifi_remembered" msgid="8426719916135950136">"Memorisà"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Deactivà"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Betg cuntanschibel"</string>
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
+    <skip />
     <string name="wifi_secured" msgid="6759903183748011566">"Segirà cun <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
     <skip />
@@ -459,29 +477,28 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Parameters IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Memorisar"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Interrumper"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Endatai per plaschair ina adressa IP valida."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Netmask"</string>
-    <!-- no translation found for wifi_tether_checkbox_text (6961605862058056788) -->
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
     <skip />
-    <!-- no translation found for wifi_tether_enabled_subtext (8948641212931906143) -->
-    <skip />
-    <!-- no translation found for wifi_tether_failed_subtext (2654888578056042315) -->
-    <skip />
-    <!-- no translation found for wifi_tether_settings_text (123573487844470195) -->
-    <skip />
-    <!-- no translation found for wifi_tether_settings_subtext (8064755682383367008) -->
-    <skip />
-    <!-- no translation found for wifi_tether_settings_title (3749063216348284432) -->
-    <skip />
-    <!-- no translation found for wifi_tether_configure_ap_text (3474995108398156258) -->
-    <skip />
-    <!-- no translation found for wifi_tether_configure_subtext (1927454307836232128) -->
-    <skip />
-    <!-- no translation found for wifi_tether_configure_ssid_default (8467525402622138547) -->
-    <skip />
+    <!-- outdated translation 796007268580464534 -->     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"WiFi-Tethering"</string>
+    <!-- outdated translation 6758080605207549918 -->     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Punct d\'access <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activ"</string>
+    <!-- outdated translation 4379214348183654280 -->     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Errur da WiFi-Tethering"</string>
+    <!-- outdated translation 8831276059149506799 -->     <string name="wifi_tether_settings_text" msgid="123573487844470195">"Parameters da tethering cun WiFi"</string>
+    <!-- outdated translation 3415164631321782704 -->     <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Configurar ed administrar il punct d\'access"</string>
+    <!-- outdated translation 3233393750798545228 -->     <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Parameters da tethering cun WiFi"</string>
+    <!-- outdated translation 7849700175083202171 -->     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configurar il punct d\'access"</string>
+    <!-- outdated translation 54089556089657247 -->     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Punct d\'access <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
+    <!-- outdated translation 4491822321218336928 -->     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Punct d\'access Android"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Tun"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Visur"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Parameters da tun"</string>
@@ -495,10 +512,8 @@
     <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en il modus silenzius"</string>
     <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Permetter la vibraziun en il modus silenzius"</string>
-    <!-- no translation found for vibrate_title (6045820877942801599) -->
-    <skip />
-    <!-- no translation found for vibrate_summary (7378130397830790458) -->
-    <skip />
+    <!-- outdated translation 5408984084125311526 -->     <string name="vibrate_title" msgid="6045820877942801599">"Vibraziun"</string>
+    <!-- outdated translation 5224303668448643275 -->     <string name="vibrate_summary" msgid="7378130397830790458">"Vibraziun per ils cloms che entran"</string>
     <string name="notification_sound_title" msgid="6316316069880531693">"Tun dad avis"</string>
     <string name="notification_sound_summary" msgid="2953599929394109819"></string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Glisch d\'avis pulsanta"</string>
@@ -586,11 +601,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"\"Numer da telefon, signal, etc.\""</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"\"Prender ora la carta SD, mussar la capacitad da memorisar disponibla\""</string>
+    <!-- outdated translation 6681164315506788024 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Carta SD &amp; memoria"</string>
+    <!-- outdated translation 6681164315506788024 -->     <string name="storage_settings" product="default" msgid="4211799979832404953">"Carta SD &amp; memoria"</string>
+    <!-- outdated translation 5379463509034022773 -->     <string name="storage_settings_title" msgid="8746016738388094064">"Parameters da la carta SD &amp; memoria dal telefonin."</string>
+    <!-- outdated translation 9176693537325988610 -->     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"\"Prender ora la carta SD, mussar la capacitad da memorisar disponibla\""</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"\"Prender ora la carta SD, mussar la capacitad da memorisar disponibla\""</string>
     <string name="status_number" msgid="5123197324870153205">"Mes numer da telefon"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versiun PRL"</string>
@@ -606,28 +621,41 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Betg disponibel"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Temp d\'activitad"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temp d\'activitad"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Memoria interna dal telefonin"</string>
-    <string name="sd_memory" msgid="151871913888051515">"Carta SD"</string>
+    <!-- outdated translation 1130932766236387454 -->     <string name="internal_memory" msgid="9129595691484260784">"Memoria interna dal telefonin"</string>
+    <!-- outdated translation 151871913888051515 -->     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Carta SD"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Carta SD"</string>
     <string name="memory_available" msgid="418542433817289474">"Memoria disponibla"</string>
     <string name="memory_size" msgid="6629067715017232195">"Memoria en total"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Demontar la carta SD"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Demontar la carta SD per la retrair a moda segira"</string>
+    <!-- outdated translation 6915293408836853020 -->     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demontar la carta SD"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Demontar la carta SD"</string>
+    <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demontar la carta SD per la retrair a moda segira"</string>
+    <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Demontar la carta SD per la retrair a moda segira"</string>
     <!-- no translation found for ptp_mode (3954718349875117695) -->
     <skip />
     <!-- no translation found for ptp_mode_summary (8709697530987890394) -->
     <skip />
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Inserir ina carta SD per la montar"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Montar la carta SD"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Montar la carta SD"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Formatar la carta SD"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Formatar (stizzar) la carta SD"</string>
+    <!-- outdated translation 2048640010381803841 -->     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Inserir ina carta SD per la montar"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Inserir ina carta SD per la montar"</string>
+    <!-- outdated translation 5940523765187704135 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Montar la carta SD"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Montar la carta SD"</string>
+    <!-- outdated translation 4936591681679097699 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Montar la carta SD"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Montar la carta SD"</string>
+    <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Formatar la carta SD"</string>
+    <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="default" msgid="2576054280507119870">"Formatar la carta SD"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Formatar (stizzar) la carta SD"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="default" msgid="915849621390821841">"Formatar (stizzar) la carta SD"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Betg disponibel"</string>
     <string name="read_only" msgid="6702420168629076340">" (mo per lectura)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Demontar la carta SD"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"\"Sche Vus demontais la carta SD, vegnan intginas da las applicaziuns che Vus utilisais a sa fermar fin che Vus attatgais puspè la carta SD.\""</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Impussibel da demontar la carta SD"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Impussibel da demontar la carta SD. Empruvai pli tard."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"La carta SD vegn demontada. Dai in tgit al champ dad avis per vesair il status."</string>
+    <!-- outdated translation 8612140627310646730 -->     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Demontar la carta SD"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Demontar la carta SD"</string>
+    <!-- outdated translation 5851214273718817727 -->     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"\"Sche Vus demontais la carta SD, vegnan intginas da las applicaziuns che Vus utilisais a sa fermar fin che Vus attatgais puspè la carta SD.\""</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"\"Sche Vus demontais la carta SD, vegnan intginas da las applicaziuns che Vus utilisais a sa fermar fin che Vus attatgais puspè la carta SD.\""</string>
+    <!-- outdated translation 4004106918266783081 -->     <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Impussibel da demontar la carta SD"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Impussibel da demontar la carta SD"</string>
+    <!-- outdated translation 9188972789897713180 -->     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Impussibel da demontar la carta SD. Empruvai pli tard."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Impussibel da demontar la carta SD. Empruvai pli tard."</string>
+    <!-- outdated translation 3213378327712151498 -->     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"La carta SD vegn demontada. Dai in tgit al champ dad avis per vesair il status."</string>
+    <!-- outdated translation 3213378327712151498 -->     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"La carta SD vegn demontada. Dai in tgit al champ dad avis per vesair il status."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Deconnectar…"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Separaziun…"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status da l\'accu"</string>
@@ -667,21 +695,42 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Terminà la reinizialisaziun dals parameters APN predefinids"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restaurar il stadi original"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Stizza tut las datas dal telefonin"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"\"Qua tras vegnan tut las datas da Voss telefonin stizzadas, tranter auter:"\n<li>"Voss conto Google"</li>\n<li>"ils parameters e las datas da las applicaziuns e dal sistem "</li>\n<li>"las applicaziuns telechargiadas"</li>\n"Ils suandants elements na vegnan betg stizzads:"\n<li>"la software dal sistem actuala ed applicaziuns preinstalladas "</li>\n<li>"datotecas memorisadas sin la carta SD (p.ex. fotos e musica)"</li>"\""</string>
+    <!-- unknown placeholder TAG_LI_0 in master_clear_desc -->
+    <skip />
+    <!-- no translation found for master_clear_desc (2163013814299528247) -->
+    <skip />
+    <!-- unknown placeholder TAG_LI_0 in master_clear_desc -->
+    <skip />
+    <!-- no translation found for master_clear_desc (1741944496458365969) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (969364037450286809) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (1397239046334307625) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (1657838142707381027) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (8100175974635894073) -->
+    <skip />
     <string name="master_clear_button_text" msgid="7550632653343157971">"Reinizialisar il telefon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Stizzar tut las datas persunalas e las applicaziuns telechargiadas? Quest pass na po betg vegnir revocà!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Stizzar tut"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dissegnai Voss schema da debloccaziun"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Vus stuais dissegnar Voss schema da debloccaziun per confermar la reinizialisaziun dal telefonin."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Las datas n\'han betg pudì vegnir reinizialisadas perquai ch\'il servetsch da purificaziun dal sistem n\'è betg disponibel."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Formatar la carta SD."</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Stizza tut las datas sin la carta SD"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Cun questa acziun vegn la carta SD en il telefonin stizzada. Vus perdais uschia TUT las datas sin la carta!"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"Formatar la carta SD"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Formatar la carta SD e stizzar l\'entir cuntegn da la carta? I n\'è betg pussaivel da revocar questa acziun!"</string>
+    <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Formatar la carta SD."</string>
+    <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="default" msgid="4427528440306787972">"Formatar la carta SD."</string>
+    <!-- outdated translation 3805714639375830120 -->     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Stizza tut las datas sin la carta SD"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Stizza tut las datas sin la carta SD"</string>
+    <!-- outdated translation 1142563222357820834 -->     <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Cun questa acziun vegn la carta SD en il telefonin stizzada. Vus perdais uschia TUT las datas sin la carta!"</string>
+    <!-- outdated translation 1142563222357820834 -->     <string name="media_format_desc" product="default" msgid="1598627584181935513">"Cun questa acziun vegn la carta SD en il telefonin stizzada. Vus perdais uschia TUT las datas sin la carta!"</string>
+    <!-- outdated translation 370856400090190151 -->     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Formatar la carta SD"</string>
+    <!-- outdated translation 370856400090190151 -->     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Formatar la carta SD"</string>
+    <!-- outdated translation 1776666694910717198 -->     <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Formatar la carta SD e stizzar l\'entir cuntegn da la carta? I n\'è betg pussaivel da revocar questa acziun!"</string>
+    <!-- outdated translation 1776666694910717198 -->     <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Formatar la carta SD e stizzar l\'entir cuntegn da la carta? I n\'è betg pussaivel da revocar questa acziun!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Stizzar tut"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dissegnai per plaschair Voss schema da debloccaziun"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Vus stuais dissegnar Voss schema da debloccaziun per confermar la formataziun da la carta SD."</string>
+    <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Vus stuais dissegnar Voss schema da debloccaziun per confermar la formataziun da la carta SD."</string>
+    <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Vus stuais dissegnar Voss schema da debloccaziun per confermar la formataziun da la carta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Parameters da clom"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"\"Configurar messadis vocals, renviar cloms, cloms spetgants, identificaziun dal clamader\""</string>
     <!-- no translation found for tether_settings_title_usb (6688416425801386511) -->
@@ -733,8 +782,7 @@
     <skip />
     <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
     <skip />
-    <!-- no translation found for tethering_help_button_text (656117495547173630) -->
-    <skip />
+    <!-- outdated translation 7322604807045355030 -->     <string name="tethering_help_button_text" msgid="656117495547173630">"Agid davart tethering"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Raits mobilas"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"\"Definir las opziuns da roaming, raits, APNs\""</string>
     <string name="location_title" msgid="1029961368397484576">"Mes lieu"</string>
@@ -742,12 +790,17 @@
     <string name="location_networks_disabled" msgid="2708968452901433980">"Mussar la posiziun en applicaziuns (sco chartas) cun utilisar raits senza fil"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Posiziun geografica determinada da WLAN e/u raits mobilas"</string>
     <string name="location_gps" msgid="6296125378829097831">"Utilisar ils satellits GPS"</string>
-    <!-- no translation found for location_street_level (7456259025474443314) -->
-    <skip />
+    <!-- outdated translation 6460740847018275745 -->     <string name="location_street_level" msgid="7456259025474443314">"Localisar sin il nivel da vias (deactivar per spargnar accu)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localisar sin nivel da vias (dovra dapli accu e tschiel avert)"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilisar il GPS assistì"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilisar in server per sustegnair il GPS (deactivar per reducir l\'utilisaziun da la rait)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilisar"</string>
+    <!-- no translation found for use_location_title (3214740644957841179) -->
+    <skip />
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Davart il telefonin"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"\"Mussar infurmaziuns legalas, status dal telefonin e versiun da la software\""</string>
     <string name="legal_information" msgid="5769301644270604095">"Infurmaziuns legalas"</string>
@@ -836,20 +889,30 @@
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nagin standard"</string>
     <string name="clear_activities" msgid="7408923511535174430">"Stizzar las acziuns predefinidas"</string>
     <string name="unknown" msgid="1592123443519355854">"Nunenconuschent"</string>
-    <!-- no translation found for sort_order_alpha (1410278099123670628) -->
-    <skip />
+    <!-- outdated translation 8622029358896599842 -->     <string name="sort_order_alpha" msgid="1410278099123670628">"Zavrar"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Zavrar tenor grondezza"</string>
+    <!-- no translation found for show_running_services (5736278767975544570) -->
+    <skip />
+    <!-- no translation found for show_background_processes (2009840211972293429) -->
+    <skip />
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar la capacitad da memorisar"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Opziuns dal filter"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Tuttas"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Telechargià"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Vegn exequì"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"Sin la carta SD"</string>
+    <!-- outdated translation 1477351142334784771 -->     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Sin la carta SD"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sin la carta SD"</string>
     <!-- no translation found for disabled (9206776641295849915) -->
     <skip />
     <!-- no translation found for no_applications (5190227407135243904) -->
     <skip />
+    <!-- no translation found for internal_storage (1584700623164275282) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (2673203150465132465) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (7623513618171928235) -->
+    <skip />
     <string name="recompute_size" msgid="7722567982831691718">"Recalcular la grondezza…"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Stizzar"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"\"Tut las datas da questa applicaziun vegnan stizzadas definitivamain, inclus tut las datotecas, ils parameters, ils contos e las bancas da datas euv.\""</string>
@@ -869,7 +932,8 @@
     <string name="version_text" msgid="9189073826278676425">"versiun <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Spustar"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Spustar sin il telefon"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Spustar a la carta SD"</string>
+    <!-- outdated translation 1143379049903056407 -->     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Spustar a la carta SD"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Spustar a la carta SD"</string>
     <string name="moving" msgid="6431016143218876491">"Spustar"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"La capacitad da memorisar a disposiziun è nunsuffizienta."</string>
     <string name="does_not_exist" msgid="837163572898468245">"L\'applicaziun n\'exista betg."</string>
@@ -877,8 +941,7 @@
     <string name="invalid_location" msgid="4934491353200240499">"Il lieu d\'installaziun inditgà è nunvalid."</string>
     <string name="system_package" msgid="1030561474413022831">"Impussibel d\'installar actualisaziuns dal sistem sin memorias externas."</string>
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Sfurzar da fermar"</string>
-    <!-- no translation found for force_stop_dlg_text (5157374701213502922) -->
-    <skip />
+    <!-- outdated translation 3381302041569982075 -->     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Questa applicaziun vegn reaviada immediatamain. La vulais Vus propi sfurzar da sa serrar?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Spustar  l\'applicaziun"</string>
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Betg reussì da spustar l\'applicaziun. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Posiziun preferida per installaziuns"</string>
@@ -890,15 +953,21 @@
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servetschs activs"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Mussar e controllar ils servetschs che vegnan exequids"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Reaviar en progress"</string>
-    <!-- no translation found for no_running_services (2059536495597645347) -->
+    <!-- no translation found for cached (1059590879740175019) -->
     <skip />
-    <!-- no translation found for service_started_by_app (6575184738671598131) -->
-    <skip />
+    <!-- outdated translation 6981216347270280598 -->     <string name="no_running_services" msgid="2059536495597645347">"Nagin servetsch en execuziun."</string>
+    <!-- outdated translation 8432097226392386802 -->     <string name="service_started_by_app" msgid="6575184738671598131">"Avià: Tutgar per serrar"</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <!-- no translation found for service_background_processes (4939976652114824214) -->
+    <!-- unknown placeholder FREE in service_background_processes -->
     <skip />
-    <!-- no translation found for service_foreground_processes (2474726487867913314) -->
+    <!-- no translation found for service_background_processes (6844156253576174488) -->
+    <skip />
+    <!-- unknown placeholder COUNT in service_foreground_processes -->
+    <skip />
+    <!-- no translation found for service_foreground_processes (7583975676795574276) -->
+    <skip />
+    <!-- no translation found for memory (6609961111091483458) -->
     <skip />
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
@@ -926,6 +995,8 @@
     <skip />
     <!-- no translation found for heavy_weight_stop_description (6855241582643136019) -->
     <skip />
+    <!-- no translation found for background_process_stop_description (1728354083304746737) -->
+    <skip />
     <!-- no translation found for service_manage_description (7050092269951613102) -->
     <skip />
     <!-- no translation found for main_running_process_description (929204645380391397) -->
@@ -934,11 +1005,16 @@
     <skip />
     <!-- no translation found for process_provider_in_use_description (5586603325677678940) -->
     <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_title (4253292537154337233) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (6929716497425738387) -->
+    <skip />
     <string name="language_settings" msgid="502219872342167227">"Lingua e tastatura"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Parameters da la lingua &amp; da la tastatura"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"\"Definir la lingua e la regiun, opziuns da l\'endataziun da text e la correctura automatica\""</string>
-    <string name="language_category" msgid="3391756582724541530">"Parameters regiunals"</string>
-    <string name="text_category" msgid="6342540511465136739">"Parameters da text"</string>
+    <!-- no translation found for language_settings_category (2288258489940617043) -->
+    <skip />
+    <!-- no translation found for keyboard_settings_category (7060453865544070642) -->
+    <skip />
     <string name="phone_language" msgid="1165758957501090679">"Tscherner la lingua"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Remplazzament auto."</string>
@@ -979,9 +1055,13 @@
     <skip />
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Administrar las opziuns d\'endataziun da text"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Parameters <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Parameters da la tastatura dal visur"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Tastatura da l\'apparat"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Parameters da la tastatura integrada"</string>
+    <!-- outdated translation 8169889453770863227 -->     <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Tastatura da l\'apparat"</string>
+    <!-- outdated translation 6404687907454621637 -->     <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Parameters da la tastatura integrada"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Svilup"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Definir las opziuns per il svilup d\'applicaziuns"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debugar USB"</string>
@@ -1014,8 +1094,7 @@
     <skip />
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Deactivar ils agids d\'endataziun?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Chattà nagina applicaziun dad agids d\'access"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
+    <!-- outdated translation 2450056749545404807 -->     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nagina applicaziun d\'agids d\'access è installada."\n\n"Vus pudais telechargiar in screen reader da l\'Android Market per Voss apparat."\n\n"Cliccai sin «OK» per installar il screen reader."</string>
     <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
     <skip />
     <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
@@ -1040,7 +1119,7 @@
     <skip />
     <!-- no translation found for battery_stats_gps_on_label (1193657533641951256) -->
     <skip />
-    <!-- no translation found for battery_stats_wifi_running_label (4100552585961214960) -->
+    <!-- no translation found for battery_stats_wifi_running_label (3093545080361658269) -->
     <skip />
     <!-- no translation found for battery_stats_wake_lock_label (1908942681902324095) -->
     <skip />
@@ -1049,8 +1128,8 @@
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Temp d\'activitad da l\'apparat"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"Temp activ WLAN"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"Temp en funcziun dal WLAN"</string>
+    <!-- outdated translation 4630925382578609056 -->     <string name="wifi_on_time" msgid="6310209835617490616">"Temp activ WLAN"</string>
+    <!-- outdated translation 4478515071957280711 -->     <string name="bluetooth_on_time" msgid="6157799524996162271">"Temp en funcziun dal WLAN"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Utilisaziun dal accu - detagls"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detagls d\'utilisaziun"</string>
@@ -1080,7 +1159,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Infurmaziuns davart l\'applicaziun"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Parameters dad applicaziuns"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Parameters visur"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Parameters WLAN"</string>
+    <!-- outdated translation 5452076674659927993 -->     <string name="battery_action_wifi" msgid="2272741639606146903">"Parameters WLAN"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Parameters Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Accu utilisà per cloms"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Consum da l\'accu sch\'il telefonin è inactiv"</string>
@@ -1093,11 +1172,9 @@
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Consumaziun da l\'accu entras Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Deactivai Bluetooth sche Vus n\'utilisais betg la funcziun."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Empruvai da connectar cun in auter apparat da Bluetooth"</string>
-    <!-- no translation found for battery_desc_apps (6665712811746233450) -->
-    <skip />
+    <!-- outdated translation 8123202939321333639 -->     <string name="battery_desc_apps" msgid="6665712811746233450">"Consum d\'accu sche applicaziuns vegnan exequidas"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Serrar u deinstallar l\'applicaziun"</string>
-    <!-- no translation found for battery_sugg_apps_gps (4545056413090932541) -->
-    <skip />
+    <!-- outdated translation 4145005297393800223 -->     <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Deactivai il GPS sche Vus n\'al utilisais betg."</string>
     <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"L\'applicaziun dispona eventualmain da parameters che permettan da reducir il consum da l\'accu."</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> dapi la deconnexiun"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Dapi la davosa deconnexiun (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
@@ -1238,8 +1315,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Las applicaziuns pon acceder a certificats segirads ed infurmaziuns d\'annunzia"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Endatar il pled-clav"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Endatai il pled-clav per la memoria da las infurmaziuns d\'annunzia."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Installar da la carta SD"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Installar ils certificats criptads da la carta SD"</string>
+    <!-- outdated translation 177337517568022236 -->     <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installar da la carta SD"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installar da la carta SD"</string>
+    <!-- outdated translation 7737001268684193093 -->     <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Installar ils certificats criptads da la carta SD"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Installar ils certificats criptads da la carta SD"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Definir il pled-clav"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Definir/midar il pled-clav da la memoria da las infurmaziuns d\'annunzia"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Stizzar la memoria"</string>
@@ -1273,18 +1352,16 @@
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir il cumportament en cas d\'in clom d\'urgenza"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Protecziun da datas"</string>
     <string name="privacy_settings_title" msgid="1987089301293213705">"Parameters da la protecziun da datas"</string>
-    <!-- no translation found for backup_section_title (8856083167469467588) -->
-    <skip />
+    <!-- outdated translation 717834414028702406 -->     <string name="backup_section_title" msgid="8856083167469467588">"Copia da segirezza e restauraziun"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datas persunalas"</string>
     <!-- no translation found for backup_data_title (1239105919852668016) -->
     <skip />
-    <!-- no translation found for backup_data_summary (5662190190240860035) -->
+    <!-- no translation found for backup_data_summary (6515285107793232815) -->
     <skip />
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauraziun automatica"</string>
-    <!-- no translation found for auto_restore_summary (6867766474057290177) -->
-    <skip />
+    <!-- outdated translation 2029683590724508019 -->     <string name="auto_restore_summary" msgid="83177150536734378">"Restaurar las datas d\'applicaziun suenter l\'installaziun da las applicaziuns a maun da la copia da segirezza"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Copia da segirezza"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Vulais Vus propi interrumper la copia da segirezza dals parameters e da las datas da l\'applicaziun e stizzar tut las copias sin ils servers da Google?"</string>
+    <!-- outdated translation 2948090854996352245 -->     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Vulais Vus propi interrumper la copia da segirezza dals parameters e da las datas da l\'applicaziun e stizzar tut las copias sin ils servers da Google?"</string>
     <!-- no translation found for device_admin_settings_title (1335557832906433309) -->
     <skip />
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administratur dad apparats"</string>
@@ -1317,6 +1394,8 @@
     <skip />
     <!-- no translation found for wifi_setup_next (3388694784447820477) -->
     <skip />
+    <!-- no translation found for wifi_setup_status_scanning (7424598483871053657) -->
+    <skip />
     <!-- no translation found for wifi_setup_status_select_network (4438531984292574854) -->
     <skip />
     <!-- no translation found for wifi_setup_status_existing_network (6394925174802598186) -->
@@ -1327,7 +1406,7 @@
     <skip />
     <!-- no translation found for wifi_setup_status_connecting (2594117697215042584) -->
     <skip />
-    <!-- no translation found for wifi_setup_status_connected (5350876766935146953) -->
+    <!-- no translation found for wifi_setup_status_proceed_to_next (9071951312604559022) -->
     <skip />
     <!-- no translation found for sync_is_failing (1591561768344128377) -->
     <skip />
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 774970d..433b013 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Статический"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Выкл."</item>
     <item msgid="3165868966179561687">"Оповещение"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 547b161..32396f4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Извлечь SD-карту"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Очистить SD-карту"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Отключить USB-накопитель"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Извлечь SD-карту"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Очистить USB-накопитель"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Очистить SD-карту"</string>
     <string name="small_font" msgid="2295331917424072635">"Маленький"</string>
     <string name="medium_font" msgid="2068475425515133701">"Среднее"</string>
     <string name="large_font" msgid="599055175160971446">"Большой"</string>
     <string name="font_size_save" msgid="3450855718056759095">"ОК"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"SD-карта"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB-накопитель"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD-карта"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Состояние батареи:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Питание:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Шкала батареи:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Разряжена"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Слишком высокое напряжение"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Неизвестная ошибка"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Видимый"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Видимый в течение <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> секунд..."</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Начать <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Аккаунт:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Настройки прокси-сервера"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Настройка глобального прокси HTTP и списка исключений"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Очистить"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Порт"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Нет прокси:"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Восстановить настройки по умолчанию"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Готово"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Имя узла"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Внимание!"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ОК"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Введено недействительное имя узла."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Список исключений отформатирован неверно. Перечислите исключаемые домены через запятую."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Необходимо заполнить поле порта."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Если поле хоста не заполнено, поле порта также следует оставить пустым."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Введен недействительный порт."</string>
@@ -187,18 +187,23 @@
     <string name="band_mode_failed" msgid="1495968863884716379">"Сбой"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Успешно"</string>
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Изменения вступят в силу после повторного подключения USB-кабеля"</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Включить массовую память USB"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Включить запоминающее устройство USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Всего байтов:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Нет SD-карты"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-накопитель не подключен"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Нет SD-карты"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Свободно байтов:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"SD-карта используется в качестве устройства массовой памяти"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"SD-карта может быть извлечена"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"SD-карта была извлечена во время использования!"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-накопитель работает как запоминающее устройство"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-карта используется в качестве устройства массовой памяти"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB-накопитель можно отключить"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"SD-карта может быть извлечена"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Накопитель извлечен во время использования!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD-карта была извлечена во время использования!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Использовано байтов:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Поиск мультимедиа на SD-карте..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"SD-карта установлена только для чтения"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Сканирование USB-накопителя..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Поиск мультимедиа на SD-карте..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-накопитель защищен от записи"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD-карта установлена только для чтения"</string>
+    <string name="skip_label" msgid="47510779345218297">"Далее"</string>
     <string name="next_label" msgid="4693520878012668114">"Далее"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Язык"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Выбрать действие"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Информация о батарее"</string>
     <string name="display_label" msgid="7403874003169865762">"Экран"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Информация о телефоне"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"SD-карта"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-накопитель"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-карта"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Настройки прокси-сервера"</string>
     <string name="cancel" msgid="6859253417269739139">"Отмена"</string>
     <string name="settings_label" msgid="1626402585530130914">"Настройки"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Настройки"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Настройки"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Режим полета"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Отключить все беспроводные соединения"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Выберите оператора связи"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата и время"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Установка даты, времени, часового пояса и форматов"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Автонастройка даты и времени"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Использовать время сети"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Использовать время сети"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Автонастройка часового пояса"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Использовать часовой пояс сети"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Использовать часовой пояс сети"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-часовой формат"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Настроить время"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Выбрать часовой пояс"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Упорядочить по часовому поясу"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Блокировать устройство при тайм-ауте"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Настроить задержку перед автоблокировкой устройства"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Местоположение и защита"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Местоположение и защита устройства"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ОК"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Отмена"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Администрирование устройства"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Выбрать администраторов устройства"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Добавление и удаление администраторов устройства"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Выбрать администраторов устройства"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Добавление и удаление администраторов устройства"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Включить Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Настройки Bluetooth"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Для громкой связи"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музыки и мультимедиа"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомнить настройки"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"Включить NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Использовать радиосвязь ближнего действия для чтения и обмена метками"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Включить Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Настройки Wi-Fi"</string>
@@ -395,14 +405,16 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Подключиться к сети"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Удалить эту сеть"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Изменить сеть"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Настройка сети"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Введите PIN-код точки доступа"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"Имя сети (SSID)"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безопасность"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Уровень сигнала"</string>
-    <string name="wifi_status" msgid="4824568012414605414">"Статус "</string>
+    <string name="wifi_status" msgid="4824568012414605414">"Статус"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Скорость связи"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-адрес"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"Метод EAP"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Пользователь"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Неизвестный"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Пароль"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Показывать пароль"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Настройки IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(не изменялось)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(не указано)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Сохранено в памяти"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Отключено"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Вне диапазона"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Защищено с помощью <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Защищено с помощью <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Защита <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (режим WPS доступен)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, защищено с помощью <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Подключить"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Не подключаться"</string>
@@ -442,17 +453,25 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Настройки IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Сохранить"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Отмена"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Введите действительный IP-адрес."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Маска сети"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Точка доступа Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Точка доступа <xliff:g id="NETWORK_SSID">%1$s</xliff:g> активна"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Ошибка подключения"</string>
     <string name="wifi_tether_settings_text" msgid="123573487844470195">"Настройки точки доступа"</string>
     <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Настройка точки доступа Wi-Fi"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Настройки точки доступа "</string>
+    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Настройки точки доступа"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Настроить точку доступа Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Точка доступа <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Хот-спот Android"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Общая информация"</string>
     <string name="device_status" msgid="607405385799807324">"Общая информация"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Номер телефона, уровень сигнала и т.д."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Отключение SD-карты, сведения о доступной памяти"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Безопасность накопителя"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Память"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Настройки хранилища"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Отключить USB-накопитель, просмотреть доступные накопители"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Отключение SD-карты, сведения о доступной памяти"</string>
     <string name="status_number" msgid="5123197324870153205">"Мой номер телефона"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Версия PRL"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Время с момента включения"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Время работы"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Внутренняя память телефона"</string>
-    <string name="sd_memory" msgid="151871913888051515">"SD-карта"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Внутренний накопитель"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-накопитель"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD-карта"</string>
     <string name="memory_available" msgid="418542433817289474">"Свободно"</string>
     <string name="memory_size" msgid="6629067715017232195">"Всего места"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Извлечь SD-карту"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Нажмите сюда для безопасного извлечения SD-карты из телефона"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Безопасное извлечение"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Извлечь SD-карту"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Отключить внутр. USB-накопитель"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Отключить SD-карту для безопасного извлечения"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Включить режим PTP"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Идентифицировать устройство на шине USB как PTP-камеру, а не как устройство MTP"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Вставьте SD-карту для подключения"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Подключить SD-карту"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Подключить SD-карту"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Очистить SD-карту"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Удалить все данные с SD-карты"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Вставить USB-накопитель для подключения"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Вставьте SD-карту для подключения"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Подключить накопитель"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Подключить SD-карту"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Подключить внутр. USB-накопитель"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Подключить SD-карту"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Очистить USB-накопитель"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Очистить SD-карту"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Удаляет все данные с внутреннего USB-накопителя телефона, такие как музыка и фотографии"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Удаляет все данные с SD-карты телефона, например музыку и фотографии"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Недоступно"</string>
     <string name="read_only" msgid="6702420168629076340">" (только для чтения)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Отключение SD-карты"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Если отключить SD-карту, некоторые используемые приложения перестанут работать и могут оставаться недоступными до подключения SD-карты."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Не удалось отключить SD-карту."</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Не удается отключить SD-карту. Повторите попытку позже."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"SD-карта будет отключена. Проверьте статус в области уведомлений."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Отключить USB-накопитель"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Отключение SD-карты"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Если отключить USB-накопитель, некоторые используемые приложения перестанут работать и могут оставаться недоступными до повторного подключения этого накопителя."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Если отключить SD-карту, некоторые используемые приложения перестанут работать и могут оставаться недоступными до подключения SD-карты."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Не удалось отключить накопитель"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Не удалось отключить SD-карту."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Не удается отключить USB-накопитель. Повторите попытку позже."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Не удается отключить SD-карту. Повторите попытку позже."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-накопитель будет отключен."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-карта будет отключена."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Извлечение"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Выполняется извлечение"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Состояние батареи"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Восстановление настроек APN по умолчанию завершено"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Сброс настроек"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Удаляет все данные из памяти телефона"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"С телефона будут удалены все данные, в том числе: "\n<li>"ваш аккаунт Google"</li>\n<li>"данные и настройки системы и приложений"</li>\n<li>"загруженные приложения"</li>\n"Не будут удалены:"\n<li>"текущее системное ПО и пакетные приложения"</li>\n<li>"файлы на SD-карте, например фотографии и музыка"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Это приведет к удалению всех данных с "<b>"внутреннего накопителя"</b>" телефона, включая:"\n\n<li>"ваш аккаунт Google;"</li>\n<li>"данные и настройки системы и приложений;"</li>\n<li>"загруженные приложения."</li>\n\n"Чтобы удалить все данные с этого телефона, необходимо очистить "<b>"USB-накопитель"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Это приведет к удалению всех данных с "<b>"внутреннего накопителя"</b>" телефона, включая:"\n\n<li>"ваш аккаунт Google;"</li>\n<li>"данные и настройки системы и приложений;"</li>\n<li>"загруженные приложения."</li>\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Очистить USB-накопитель"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Очистить SD-карту"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Очищать внутренний накопитель."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Удаляет все данные на SD-карте телефона, например музыку и фотографии."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Сбросить настройки телефона"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Стереть всю личную информацию и загруженные приложения? Это действие нельзя отменить!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Стереть все"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Начертить графический ключ"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Для подтверждения сброса настроек телефона необходимо начертить графический ключ."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Не удалось выполнить сброс, поскольку служба System Clear недоступна."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Очистить SD-карту"</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Удаляет все данные с карты SD"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Это действие приведет к очистке карты SD в телефоне. ВСЯ информация, находящаяся на карте, будет удалена!"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"Очистить SD-карту"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Форматировать карту SD с удалением всех ваших данных? Это действие нельзя отменить!"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Очистить USB-накопитель"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Очистить SD-карту"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Уничтожает все данные на USB-накопителе"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Удаляет все данные с карты SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Это приведет к очистке USB-накопителя. Вы потеряете "<b>"все"</b>" хранящиеся на нем данные!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Это приведет к очистке SD-карты. Вы потеряете "<b>"все"</b>" данные на карте!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Очистить USB-накопитель"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Очистить SD-карту"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Очистить USB-накопитель, безвозвратно удалив все файлы на нем?"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Очистить SD-карту, безвозвратно удалив все файлы на ней?"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Стереть все"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Начертить графический ключ разблокировки"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Для подтверждения форматирования карты SD нужно начертить графический ключ разблокировки."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Для подтверждения очистки USB-накопителя начертите графический ключ."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Для подтверждения очистки SD-карты начертите графический ключ."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Вызовы"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Голосовая почта, АОН, переадресация, параллельный вызов"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Общий USB-модем"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Ошибка общего Bluetooth-модема"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Нельзя установить подключение более, чем для <xliff:g id="MAXCONNECTION">%1$d</xliff:g> устр."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Подключение к <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет прервано."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Настройки Bluetooth-модема"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Выберите устройства Bluetooth для подключения"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Справка"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобильная сеть"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Настроить параметры роуминга, сетей, точек доступа (APN)"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Использовать A-GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Использовать сервер для A-GPS (снимите флажок для менее интенсивного использования сети)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Использовать сервер для A-GPS (снимите флажок для улучшения работы GPS)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Мое местоположение"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"О телефоне"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Посмотреть правовую информацию, состояние телефона, версию ПО"</string>
     <string name="legal_information" msgid="5769301644270604095">"Правовая информация"</string>
@@ -755,7 +801,7 @@
     <string name="lock_example_title" msgid="8052305554017485410">"Пример графического ключа"</string>
     <string name="lock_example_message" msgid="1838650097090632706">"Соедините как минимум четыре точки."\n" "\n"Выберите \"Далее\", когда будете готовы начертить собственный графический ключ разблокировки."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Управление приложениями"</string>
-    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Управление установленными приложениями и их удаление "</string>
+    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Управление установленными приложениями и их удаление"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Приложения"</string>
     <string name="applications_settings_summary" msgid="2714215108369119717">"Управление приложениями, настройка клавиш быстрого запуска"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"Настройки приложения"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Неизвестно"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Упорядочить по именам"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Упорядочить по размеру"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Показать активные службы"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Показать процессы в кэше"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управление местом"</string>
     <string name="filter" msgid="2018011724373033887">"Фильтр"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Выбрать параметры фильтра"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Все"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Сторонние"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Работающие"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"На SD-карте"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-накопитель"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD-карте"</string>
     <string name="disabled" msgid="9206776641295849915">"Отключено"</string>
     <string name="no_applications" msgid="5190227407135243904">"Нет приложений."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Внутренний накопитель"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-накопитель"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-карта"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Повторное вычисление размера..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Удалить"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Все данные этой программы будут удалены навсегда, включая все файлы, базы данных, настройки, аккаунты и прочее."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"Версия <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Переместить"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Переместить на телефон"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Переместить на SD-карту"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Перенести на USB-накопитель"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Переместить на SD-карту"</string>
     <string name="moving" msgid="6431016143218876491">"Перемещение"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Недостаточно свободной памяти."</string>
     <string name="does_not_exist" msgid="837163572898468245">"Приложение не существует."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Место установки"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Изменить установочную папку для новых приложений."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Использование хранилища"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Хранилище, используемое приложениями"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Работающие программы"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Просмотр и управление работающими программами"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Перезапуск"</string>
+    <string name="cached" msgid="1059590879740175019">"Кэшированный фоновый процесс"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Ничего не запущено."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Запущено приложением."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"Доступно: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> используется"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> свободно"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> занято"</string>
+    <string name="memory" msgid="6609961111091483458">"ОЗУ"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Процессов: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; служб: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Настройки"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Эта служба была запущена ее приложением. Остановка может привести к ошибке приложения."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Данное приложение нельзя остановить безопасно. Это может привести к потере выполненной работы."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Это процесс, используемый в старых приложениях, который сохранен для повышения скорости в случае необходимости. Как правило, останавливать его не нужно."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: в настоящий момент используется. Нажмите \"Настройки\" для управления."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Основной используемый процесс."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Служба <xliff:g id="COMP_NAME">%1$s</xliff:g> используется."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Провайдер <xliff:g id="COMP_NAME">%1$s</xliff:g> используется."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Остановить системную службу?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Вы действительно хотите остановить эту системную службу? В этом случае некоторые функции телефона могут перестать работать до его выключения и повторного включения."</string>
     <string name="language_settings" msgid="502219872342167227">"Язык и клавиатура"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Настройки языка и клавиатуры"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Языковые настройки"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Настройки клавиатуры"</string>
     <string name="phone_language" msgid="1165758957501090679">"Выбрать язык"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Автокоррекция"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Способ ввода"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Задать параметры ввода текста"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Настройки <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Настройки экранной клавиатуры"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Клавиатура устройства"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Настройки встроенной клавиатуры"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Встроенная клавиатура"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Настройки встроенной клавиатуры"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Разработка"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Настройка параметров для разработки приложений"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отладка по USB"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Эта служба специальных возможностей может записывать весь текст, который вы вводите, в том числе личные данные и номера кредитных карт, за исключением паролей. Служба запущена приложением <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Использовать службу?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Отключить специальные возможности?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Не найдено программ для упрощения доступа"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"У вас нет установленных программ для упрощения доступа."\n\n"Вы можете загрузить программу чтения с экрана из Android Маркета."\n\n"Нажмите \"ОК\", чтобы установить программу чтения с экрана."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Скрипты доступности"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Загружать скрипты доступности"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Разрешить приложениям загружать скрипты доступности"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Некоторые приложения могут запрашивать у Google загрузку на телефон скриптов, чтобы сделать свое содержание более доступным. Вы хотите разрешить Google устанавливать эти скрипты на телефон?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Кнопка питания"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Заверш. вызов кнопкой"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Завершать вызов при нажатии кнопки питания"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Идет зарядка"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Экран включен"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS вкл."</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"WI-FI"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Режим бодрствования"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Сигнал телефона"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Время включения устройства"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"Время работы WiFi"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"Время работы WiFi"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Время работы Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Время работы Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Сведения о расходе заряда батареи"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Сведения об использовании"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ЦП – активный режим"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Не отключать"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Использование Wi-Fi"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Телефон"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Отправлено данных"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Получено данных"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Сведения о приложении"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Настройки приложения"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Настройки экрана"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Настройки WiFi"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Настройки Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Настройки Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Использование батареи для голосовых вызовов"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Расход заряда батареи в режиме ожидания"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и рег. данных"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ввод пароля"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Введите пароль для доступа в хранилище регистрационных данных."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Установка с SD-карты"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Установить сертификаты шифрования с карты памяти"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Устанавливать с накопителя"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Установка с SD-карты"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Устанавливать зашифрованные сертификаты с USB-накопителя"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Установить сертификаты шифрования с карты памяти"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Установить пароль"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Установить или изменить пароль для доступа в хранилище рег. данных"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Очистить хранилище"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Резервное копирование и восстановление"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Личные данные"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Резервное копирование данных"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Создать резервную копию настроек и других данных."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Резервное копирование данных приложений, паролей Wi-Fi и других настроек в Google"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автовосстановление"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"При переустановке приложения восстановить резервные копии настроек и других данных."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"При переустановке приложения восстановить резервные копии настроек и других данных"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Резервное копирование"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Вы уверены, что не хотите больше создавать резервные копии настроек и данных программ и хотите удалить все копии с серверов Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Вы уверены, что хотите прекратить создавать резервные копии паролей Wi-Fi, закладок, настроек и данных приложений и удалить все копии с серверов Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Настройки администрирования устройства"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Администратор устройства"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Отключить"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Обновить список"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Пропустить"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Далее"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Поиск доступных сетей..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Нажмите, чтобы выбрать сеть"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Подключиться к существующей сети"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Введите конфигурацию сети"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Подключиться к новой сети"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Подключение..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Подключено"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Перейти к следующему шагу"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Проблемы с синхронизацией. Скоро все снова будет работать."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Добавить аккаунт"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Общие настройки синхронизации"</string>
+    <string name="background_data" msgid="5779592891375473817">"Фоновые данные"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Синхронизация, отправка и прием данных возможны всегда"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Внимание!"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Отключение фонового режима обмена данными экономит энергию батареи и уменьшает объем трафика. Однако некоторые приложения могут использовать фоновую передачу даже после ее отключения."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Синхронизировать автоматически"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Приложения синхронизируют данные автоматически"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Управление аккаунтами"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Синхронизация включена"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Синхронизация выключена"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Ошибка синхронизации"</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index d0f41a7..b6bf434 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statisk"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Av"</item>
     <item msgid="3165868966179561687">"Varning"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 76eabb1..4b52760 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"Montera bort SD-kort"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"Formatera SD-kort"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Demontera USB-enhet"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Montera bort SD-kort"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Radera USB-lagring"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Radera SD-kort"</string>
     <string name="small_font" msgid="2295331917424072635">"Liten"</string>
     <string name="medium_font" msgid="2068475425515133701">"Medium"</string>
     <string name="large_font" msgid="599055175160971446">"Stor"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"SD-kort"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB-lagring"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD-kort"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Batteristatus"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Elkontakt:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Batteriskala:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Slut"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Överspänning"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Okänt fel"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Synlighet"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Synlig i <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunder..."</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Starta <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Konto:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Proxy-inställningar"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Ange global HTTP-proxy och uteslutningslistor"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Rensa"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Ingen proxyserver för"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Återställ standardinställningar"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Klar"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Värdnamn"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Obs!"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Värdnamnet som du har angett är inte giltigt."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Uteslutningslistan du angav är inte korrekt formaterad. Ange en kommaavgränsad lista över uteslutna domäner."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du måste fylla i portfältet."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfältet måste vara tomt om värdfältet är tomt."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Porten som du har angett är inte giltig."</string>
@@ -189,16 +189,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Ändringarna börjar gälla när USB-kabeln har anslutits igen"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Aktivera USB-masslagring"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Totalt antal bytes:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"Inget SD-kort"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-enheten ej demonterad"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Inget SD-kort"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Tillgängliga bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"SD-kort används som enhet för masslagring"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"Det är nu säkert att ta bort SD-kortet"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"SD-kortet togs bort medan det användes!"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-lagringsenhetet används som masslagringsenhet"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-kort används som enhet för masslagring"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Säkert att ta bort USB-enheten"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Det är nu säkert att ta bort SD-kortet"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-enheten togs borts fast den användes!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD-kortet togs bort medan det användes!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes som har använts:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"Skannar SD-kort för media…"</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"SD-kortet har monterats som skrivskyddat"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Söker efter media på USB-enhet..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Skannar SD-kort för media…"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Skrivskydd. USB-enhet monterad"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD-kortet har monterats som skrivskyddat"</string>
+    <string name="skip_label" msgid="47510779345218297">"Hoppa över"</string>
     <string name="next_label" msgid="4693520878012668114">"Nästa"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Språk"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Välj aktivitet"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Batteriinformation"</string>
     <string name="display_label" msgid="7403874003169865762">"Skärm"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Telefoninformation"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"SD-kort"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-lagring"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-inställningar"</string>
     <string name="cancel" msgid="6859253417269739139">"Avbryt"</string>
     <string name="settings_label" msgid="1626402585530130914">"Inställningar"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Inställningar"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Inställningar"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flygplansläge"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Inaktivera alla trådlösa anslutningar"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Välj en nätverksoperatör"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum och tid"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Ange datum, tidszon och format"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatiskt datum och tid"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Använd nätverkets tid"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Använd nätverkets tid"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatisk tidszon"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Använd nätverkets tidszon"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Använd nätverkets tidszon"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Använd 24-timmarsformat"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Ange tid"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Välj tidszon"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortera efter tidszon"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Lås enheten när tidsgränsen uppnåtts"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Justera fördröjningen innan enheten låses automatiskt"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Plats och säkerhet"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Inställningar för plats och säkerhet"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Avbryt"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Enhetsadministration"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Välj enhetsadministratörer"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Lägga till eller ta bort enhetsadministratörer"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Välj enhetsadministratörer"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Lägga till eller ta bort enhetsadministratörer"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Aktivera Bluetooth"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-inställningar"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som högtalartelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"För musik och media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kom ihåg inställningarna"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Använd närfältskommunikation för att läsa och utbyta taggar"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Aktivera Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi-inställningar"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Anslut till nätverk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Glöm nätverk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ändra nätverk"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Nätverkskonfiguration"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Ange PIN från åtkomstpunkten"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"Nätverks-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Säkerhet"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Lösenord"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Visa lösenord"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-inställningar"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(oförändrat)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ospecificerat)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Lagrad"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Inaktiverat"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Inte i intervall"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Skyddad med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Skyddad med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Skyddad av <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS tillgängligt)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, skyddad med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Anslut"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glöm"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP-inställningar"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Spara"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Avbryt"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Ange en giltig IP-adress."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Nätmask"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobil Wi-Fi-surfpunkt"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobil surfpunkt <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fel på mobil Wi-Fi-surfpunkt"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Telefonnummer, signal osv."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"Montera bort SD-kort, visa tillgängligt lagringsutrymme"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Lagringsinställningar"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Lagring"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Lagringsinställningar"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Demontera USB-lagringsenheten och visa tillgängligt lagringsutrymme"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Montera bort SD-kort, visa tillgängligt lagringsutrymme"</string>
     <string name="status_number" msgid="5123197324870153205">"Mitt telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-version"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Inte tillgängligt"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tid sedan systemstart"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktiveringstid"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Intern telefonlagring"</string>
-    <string name="sd_memory" msgid="151871913888051515">"SD-kort"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Intern lagring"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lagring"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kort"</string>
     <string name="memory_available" msgid="418542433817289474">"Tillgängligt utrymme"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totalt utrymme"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"Montera bort SD-kort"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"Montera bort SD-kortet för säker borttagning"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Montera bort enhet"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Montera bort SD-kort"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demontera intern USB-lagring"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Demontera SD-kortet för säker borttagning"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"Aktivera PTP-läge"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"Visa som en PTP-kamera på USB istället för som en MTP-enhet"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Sätt in ett SD-kort för montering"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"Montera SD-kort"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"Montera SD-kortet"</string>
-    <string name="sd_format" msgid="5448738337382712203">"Formatera SD-kort"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"Formatera (radera) SD-kortet"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Sätt i USB om du vill montera"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Sätt in ett SD-kort för montering"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Montera delad enhet"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Montera SD-kort"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Demontera intern USB-lagring"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Montera SD-kortet"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Radera USB-lagring"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Radera SD-kort"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Raderar alla data på telefonens interna USB-lagring, som musik och foton."</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Raderar alla data på telefonens SD-kort, som musik och foton"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Inte tillgängligt"</string>
     <string name="read_only" msgid="6702420168629076340">" (Skrivskyddad)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Montera bort SD-kort"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Om du monterar bort SD-kortet avbryts några av de program som körs och de kanske inte blir tillgängliga igen förrän du monterar tillbaka SD-kortet."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Det gick inte att montera bort SD-kort"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Det går inte att montera bort SD-kort. Försök senare."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"SD-kortet monteras bort. Aktuell status visas i meddelandeområdet."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Demontera USB-enhet"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Montera bort SD-kort"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Om du demonterar USB-lagringsenheten avbryts några av de program som körs och de kanske inte blir tillgängliga igen förrän du monterar tillbaka USB-enheten."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Om du monterar bort SD-kortet avbryts några av de program som körs och de kanske inte blir tillgängliga igen förrän du monterar tillbaka SD-kortet."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"USB-enheten har ej demonterats"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Det gick inte att montera bort SD-kort"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Det går inte att demontera USB-lagringsenheten. Försök igen senare."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Det går inte att montera bort SD-kort. Försök senare."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-lagringsenheten demonteras."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Delad lagringsenhet monteras bort."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Monterar bort"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Monterar bort"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Återställning av standardinställningar för APN har slutförts"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Återställ standardinst."</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Raderar alla data på telefonen"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Detta tar bort alla data från telefonen, inklusive: "\n<li>"Ditt Google-konto"</li>\n<li>"Data och inställningar för system och program"</li>\n<li>"Hämtade program"</li>\n"Det tar inte bort:"\n<li>"Aktuell systemprogramvara och medföljande program"</li>\n<li>"Filer på SD-kortet, som musik eller bilder"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Alla data på telefonens "<b>"interna lagring"</b>" raderas, inklusive:"\n\n<li>"ditt Google-konto"</li>\n<li>"system- och programdata och inställningar"</li>\n<li>"hämtade appar"</li>\n\n"Om du vill ta bort alla data från telefonen måste du radera "<b>"USB-lagringsenheten"</b>"."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Alla data på telefonens "<b>"interna lagring"</b>" raderas, inklusive:"\n\n<li>"ditt Google-konto"</li>\n<li>"system- och programdata"</li>\n<li>"hämtade appar"</li>\n\n"Om du även vill ta bort musik, bilder och andra användardata måste du radera "<b>"SD-kortet"</b>"."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Radera USB-lagring"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Radera SD-kort"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Radera alla data på telefonens interna USB-lagring, som musik och foton."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Radera alla data på telefonens SD-kort, som musik och foton."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Återställ telefonen"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Vill du ta bort all personlig information och alla hämtade program? Det går inte att ångra åtgärden!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Radera allt"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Rita ditt grafiska lösenord"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Du måste rita ditt grafiska lösenord om du vill återställa telefonen."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Återställningen utfördes inte eftersom tjänsten för systemrensning inte är tillgänglig."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"Formatera SD-kort"</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"Tar bort alla data på SD-kortet"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Den här åtgärden raderar SD-kortet i telefonen. ALLA data på kortet försvinner!"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"Formatera SD-kort"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"Formatera SD-kort, radera alla mediafiler? Åtgärden kan inte ångras!"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Radera USB-lagring"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Radera SD-kort"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Raderar allt på USB-enheten"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Tar bort alla data på SD-kortet"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Åtgärden raderar USB-lagringsenheten. Du förlorar "<b>"alla"</b>" data som sparats där."</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Den här åtgärden raderar SD-kortet. "<b>"Alla"</b>"data på kortet försvinner."</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Radera USB-lagring"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Radera SD-kort"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Radera USB-lagringsenheten och ta bort alla filer? Åtgärden kan inte ångras."</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Radera SD-kort och alla filer på kortet? Åtgärden kan inte ångras!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Radera allt"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Rita ditt grafiska lösenord"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Du måste rita ditt grafiska lösenord för att bekräfta formateringen av SD-kortet."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Du måste rita ditt grafiska lösenord om du vill bekräfta formateringen av USB-lagringsenheten."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Du måste rita ditt grafiska lösenord om du vill bekräfta formateringen av SD-kortet."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Samtalsinställningar"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ställ in röstbrevlåda, vidarebefordra samtal, samtal väntar, nummerpres."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Internetdelning via USB"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Fel vid Internetdelning via Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Det går inte att dela med mer än <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheter"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas från."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Inställningar för delning via Bluetooth"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"Välj Bluetooth-enheter för delning"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjälp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobila nätverk"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Ställ in alternativ för roaming, nätverk, APN:er"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Använd assisterad GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Använd servern för att förbättra GPS-funktionen (avmarkera om du vill minska nätverksbelastningen)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Använd servern för att förbättra GPS-funktionen (avmarkera om du vill förbättra GPS-funktionen)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Använd Min plats"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Om telefonen"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Visa juridisk information, telefonstatus, programversion"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridisk information"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Okänd"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sortera efter namn"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sortera efter storlek"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Visa tjänster som körs"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Visa cachade processer"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Hantera utrymme"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrera"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Välj filteralternativ"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alla"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Hämtade"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kör"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"På SD-kort"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
     <string name="disabled" msgid="9206776641295849915">"Inaktiverat"</string>
     <string name="no_applications" msgid="5190227407135243904">"Inga program."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortslagring"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Räknar om storlek…"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Radera"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Alla programmets data tas bort permanent. Det inkluderar alla filer, inställningar, konton, databaser och så vidare."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Flytta"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Flytta till telefon"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Flytta till SD-kort"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Flytta till USB-enhet"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Flytta till SD-kort"</string>
     <string name="moving" msgid="6431016143218876491">"Flyttar"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Det finns inte tillräckligt med ledigt minne."</string>
     <string name="does_not_exist" msgid="837163572898468245">"Programmet finns inte."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Önskad installationsplats"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Ändra önskad installationsplats för nya program."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Använt utrymme"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Visa lagring som används av program"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktiva tjänster"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Visa och styr aktiva tjänster"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Startar om"</string>
+    <string name="cached" msgid="1059590879740175019">"Cachade bakgrundsprocesser"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Inget körs."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Startades av ett program."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> tillgänglig"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> används"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> led."</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> anv."</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process och <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjänst"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Inställningar"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Tjänsten startades av programmet. Om du avbryter den kan det bli fel i programmet."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Programmet kan inte stängas av på ett säkert sätt. Om du stänger av det kan ditt arbete gå förlorat."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Detta är en gammal programprocess som sparats för eventuella framtida behov. Det finns ingen anledning att avsluta den."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g> används just nu. Tryck på Inställningar om du vill styra det."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Huvudprocess som används."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Tjänsten <xliff:g id="COMP_NAME">%1$s</xliff:g> används."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Leverantören <xliff:g id="COMP_NAME">%1$s</xliff:g> används."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Avsluta systemtjänst?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Är du säker på att du vill avsluta systemtjänsten? Vissa funktioner på telefonen kan sluta fungera och du måste eventuellt stänga av telefonen och starta om den igen för att åtgärda problemet."</string>
     <string name="language_settings" msgid="502219872342167227">"Språk och tangentbord"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Inställningar för språk och tangentbord"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Språkinställningar"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Tangentbordsinställningar"</string>
     <string name="phone_language" msgid="1165758957501090679">"Välj språk"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Ersätt automatiskt"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Indatametod"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Hantera textinmatningsalternativ"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-inställningar"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Inställningar för tangentbordet på skärmen"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Enhetens tangentbord"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Inställningar för inbyggt tangentbord"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Inbyggt tangentbord"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Inställningar för inbyggt, fysiskt tangentbord"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Utveckling"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Ange alternativ för programutveckling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-felsökning"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Tillgänglighetstjänsten kan samla in all text du skriver, inklusive personliga uppgifter som kreditkortsnummer, men inte lösenord. Den kan även logga din kommunikation med användargränssnittet. Den kommer från programmet <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Vill du aktivera tillgänglighetstjänsten?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Vill du inaktivera tillgänglighet?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Hittade inga tillgänglighetsrelaterade program"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Du har inga tillgänglighetsrelaterade program installerade."\n\n"Du kan hämta en skärmläsare för enheten från Android Market."\n\n"Klicka på OK om du vill installera skärmläsaren."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Tillgänglighetsskript"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Hämta tillgänglighetsskript"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Tillåt att program hämtar tillgänglighetsskript från Google"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Vissa program kan be om att få hämta skript från Google till telefonen för att innehållet ska bli mer tillgängligt. Vill du tillåta att Google installerar tillgänglighetsskript i din telefon?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Avstängningsknapp"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Avstängningsknappen avslutar samtal"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Under ett samtal avslutar avstängningsknappen samtalet i stället för att stänga av skärmen"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Laddar"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skärm på"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS på"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"WiFi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefonsignal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Aktiv tid för enheten"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"WiFi på sedan"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"WiFi på sedan"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"WiFi i tid"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"WiFi i tid"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Information om batteriförbrukning"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Information om användning"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU i förgrunden"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behåll aktiv"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"WiFi körs"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Skickade data"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Mottagna data"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Programinformation"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Programinställningar"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Skärminställningar"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"WiFi-inställningar"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"WiFi-inställningar"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-inställningar"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batteri som förbrukats av röstsamtal"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Batteri som förbrukas när telefonen är inaktiv"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Tillåt att program får åtkomst till säkra certifikat och andra uppgifter"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ange lösenord"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Ange lösenord för lagring av uppgifter."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"Installera från SD-kort"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"Installera krypterade certifikat från SD-kort"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installera från USB-enhet"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installera från SD-kort"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Installera krypterade certifikat från USB-enhet"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Installera krypterade certifikat från SD-kort"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Ange lösenord"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Ange eller ändra lösenord för uppgiftslagring"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Rensa lagring"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Säkerhetskopiera och återställ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personliga data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Säkerhetskopiera mina data"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Säkerhetskopiera mina inställningar och andra programdata."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Spara en säkerhetskopia av programdata, WiFi-lösenord och andra inställningar på Googles servrar"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk återställning"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Om jag installerar om ett program eller återställer säkerhetskopierade inställningar eller data."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Om jag installerar om en app eller återställer säkerhetskopierade inställningar eller data"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Säkerhetskopia"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Vill du avbryta säkerhetskopieringen av dina inställningar och programdata och radera alla kopior på Googles servrar?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Vill du avbryta säkerhetskopieringen av dina WiFi-lösenord, bokmärken och andra inställningar och programdata och radera alla kopior på Googles servrar?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Inställningar för enhetsadministration"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Enhetsadministratör"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Inaktivera"</string>
@@ -1206,37 +1265,26 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Uppdatera lista"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Hoppa över"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Nästa"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Skannar nätverk..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Tryck om du vill välja nätverket"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Anslut till befintligt nätverk"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Ange nätverkskonfiguration"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Anslut till ett nytt nätverk"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Ansluter..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Ansluten"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Fortsätt till nästa steg"</string>
     <!-- no translation found for sync_is_failing (1591561768344128377) -->
     <skip />
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Lägg till konto"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Allmänna synkinställningar"</string>
+    <string name="background_data" msgid="5779592891375473817">"Bakgrundsdata"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Program kan synkronisera, skicka och ta emot data när som helst"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Obs!"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Om du inaktiverar bakgrundsdata sparar du batteri och minskar dataanvändning. Vissa program kanske fortfarande använder anslutningen för bakgrundsdata."</string>
     <!-- no translation found for sync_automatically (7558810110682562376) -->
     <skip />
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Programmen synkroniserar data automatiskt"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Hantera konton"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synkronisering är på"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synkronisering är avstängd"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Synkroniseringsfel"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 6a7d6c8..9205685 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statik"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Kapalı"</item>
     <item msgid="3165868966179561687">"Uyarı"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 43cb956..6fa1a0f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"SD kartının bağlantısını kes"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"SD kartı biçimlendir"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"USB dep brmnn bağln kes"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD kartının bağlantısını kes"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB depolama birimini sil"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD kartı sil"</string>
     <string name="small_font" msgid="2295331917424072635">"Küçük"</string>
     <string name="medium_font" msgid="2068475425515133701">"Ortam"</string>
     <string name="large_font" msgid="599055175160971446">"Büyük"</string>
     <string name="font_size_save" msgid="3450855718056759095">"Tamam"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"SD kart"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB depolama birimi"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD kart"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Pil durumu:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Güç fişi:"</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"Pil skalası:"</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Ölü"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Aşırı voltaj"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Bilinmeyen hata"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Keşfedilebilir"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> saniye için keşfedilebilir…"</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> işlemini başlat"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Hesap:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Proxy Ayarları"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Genel HTTP proxy\'sini ve dışlama listelerini ayarla"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Temizle"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"Bağlantı Noktası"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"Proxy\'si olmayanlar:"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Varsayılanları geri yükle"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Bitti"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"Ana makine adı"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Dikkat"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Tamam"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Yazdığınız ana makine adı geçersiz."</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Yazdığınız dışlama listesi doğru biçimlendirilmemiş. Lütfen dışlanan alanların virgülle ayrılmış listesini girin."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Bağlantı noktası alanını tamamlamalısınız."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ana makine alanı boşsa, bağlantı noktası alanı boş olmalıdır."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Girdiğiniz bağlantı noktası geçersiz."</string>
@@ -189,16 +189,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Değişiklikler USB kablosu bağlandığında devreye girer"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB yığın depolamasını etkinleştir"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Toplam bayt sayısı:"</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"SD kart yok"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB deplm birimi bağlı değil"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"SD kart yok"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Kullanılabilir bayt:"</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"SD kart, yığın depolama cihazı olarak kullanılıyor"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"SD kart şimdi güvenli olarak çıkarılabilir"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"SD kart kullanılırken çıkarıldı!"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB dep brmi, yığın dep cihazı olarak kullanılıyor"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD kart, yığın depolama cihazı olarak kullanılıyor"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"USB dep brmi şimdi güvenle çıkarılabilir"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"SD kart şimdi güvenli olarak çıkarılabilir"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB dep birimi kullanılırken çıkarıldı!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD kart kullanılırken çıkarıldı!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Kullanılan bayt miktarı:"</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"SD kartta medya aranıyor…"</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"SD kart salt okunur olarak bağlandı"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB dep brdki medya taranyr..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD kartta medya aranıyor…"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB dep birm salt oknr takıldı"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD kart salt okunur olarak bağlandı"</string>
+    <string name="skip_label" msgid="47510779345218297">"Atla"</string>
     <string name="next_label" msgid="4693520878012668114">"İleri"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Dil"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Etkinlik seç"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Pil bilgileri"</string>
     <string name="display_label" msgid="7403874003169865762">"Ekran"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"Telefon bilgileri"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"SD kart"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB depolama birimi"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD kart"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy ayarları"</string>
     <string name="cancel" msgid="6859253417269739139">"İptal"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ayarlar"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Ayarlar"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"Ayarlar"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Uçak modu"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Tüm kablosuz bağlantıları devre dışı bırak"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"Bir ağ operatörü seçin"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Tarih ve saat"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Tarihi, saati, saat dilimini ve biçimleri ayarla"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Otomatik tarih ve saat"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Ağ tarafından sağlanan saati kullan"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Ağ tarafından sağlanan saati kullan"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Otomatik saat dilimi"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Ağ tarafından sağlanan saat dilimini kullan"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Ağ tarafından sağlanan saat dilimini kullan"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 saat biçimini kullan"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Saati ayarla"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Saat dilimini seç"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Saat dilimine göre sırala"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"Zaman aşımı süresi dolduktan sonra cihazı kilitle"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"Cihaz otomatik olarak kilitlenmeden önceki gecikmeyi ayarlayın"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"Konum ve güvenlik"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Konum ve güvenlik ayarları"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Tamam"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"İptal"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Cihaz yönetimi"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Cihaz yöneticilerini seçin"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Aygıt yöneticilerini ekleyin veya kaldırın"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Cihaz yöneticilerini seçin"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Aygıt yöneticilerini ekleyin veya kaldırın"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth\'u aç"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth ayarları"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon hoparlörü olarak"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Müzik ve medya için"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ayarları anımsa"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Etkt okumk ve değş yap içn Yakın Alan İletşm\'ni kullnn"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Kablosuz"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Kablosuzu aç"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Kablosuz ayarları"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ağa bağlan"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Ağı unut"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ağı değiştir"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Ağ Kurulumu"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Erişim noktasının PIN\'ini girin"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"Ağ SSID\'si"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Güvenlik"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Kimlik"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonim kimlik"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Şifre"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"Şifreyi göster"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP ayarları"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(değişmedi)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(belirtilmemiş)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"Anımsandı"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"Devre dışı"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Kapsama alanı dışında"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"<xliff:g id="WIFI_SECURITY">%1$s</xliff:g> ile güvenlik altına alındı"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"<xliff:g id="WIFI_SECURITY">%1$s</xliff:g> ile güvenlik altına alındı"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Güvenliği <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> ile sağlanmaktadır (WPS kullanılabilir)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> ile güvenlik altına alındı"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Bağlan"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP ayarları"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Kaydet"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"İptal"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Lütfen geçerli bir IP adresi yazın."</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Geçit"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Ağ maskesi"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Taşınabilir kablosuz ortak erişim noktası"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Taşınabilir ortak erişim noktası <xliff:g id="NETWORK_SSID">%1$s</xliff:g> etkin"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Taşınabilir kablosuz ortak erişim noktası hatası"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Durum"</string>
     <string name="device_status" msgid="607405385799807324">"Durum"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Telefon numarası, sinyal vb."</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"SD kartın bağlantısını kes, kull. Depolama alanını görüntüle"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"Paylaşılan ve güvenli deplm birimi"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"Depolama"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Depolama ayarları"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB depolama biriminin bağlantısını kes, kullanılabilir depolama alanını görüntüle"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD kartın bağlantısını kes, kull. Depolama alanını görüntüle"</string>
     <string name="status_number" msgid="5123197324870153205">"Telefon numaram"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MİN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL Sürümü"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"Kullanılamıyor"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Açık kalma süresi"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Uyanık geçen süre"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"Dahili telefon depolama alanı"</string>
-    <string name="sd_memory" msgid="151871913888051515">"SD kart"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"Dahili dep birm"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB depolama birimi"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD kart"</string>
     <string name="memory_available" msgid="418542433817289474">"Kullanılabilir alan"</string>
     <string name="memory_size" msgid="6629067715017232195">"Toplam alan"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"SD kartının bağlantısını kes"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"SD kartı güvenle çıkarmak için bağlantısını kesin"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Payl dep birimnn bağl kes"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartının bağlantısını kes"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Dahili USB depolamanın bağ kes"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Güvenle çıkarabilmnz için SD kartın bağl kesin"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"PTP modunu etkinleştir"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"USB\'de MTP cihazı yerine PTP kamera cihazı olarak görün"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"Eklemek için bir SD kart yerleştirin"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"SD kartı ekle"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"SD kartı ekle"</string>
-    <string name="sd_format" msgid="5448738337382712203">"SD kartı biçimlendir"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"SD kartı biçimlendir (sil)"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Bğl için USB dep brm takn"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Eklemek için bir SD kart yerleştirin"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Payl deplm birimini bağla"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"SD kartı ekle"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Dahili USB depol birimini ekle"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"SD kartı ekle"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB depolama birimini sil"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"SD kartı sil"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Telefonunun USB depolama birimindeki müzik ve foto gibi tüm veriler silinir."</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Telefonun SD kartındaki müzik ve foto gibi tüm veriler silinir."</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Kullanılamıyor"</string>
     <string name="read_only" msgid="6702420168629076340">" (Salt okunur)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"SD kartının bağlantısını kes"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"SD kartı çıkarırsanız, kullanmakta olduğunuz bazı uygulamalar durur ve SD kart yeniden takılıncaya kadar kullanılamayabilir."</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"SD kartın bağlantısı kesilemedi"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"SD kartın bağlantısı kesilemiyor. Daha sonra yeniden deneyin."</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"SD kart çıkarılacak. Durum bilgisi için bildirim alanını kontrol edin."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"USB dep brmnn bağln kes"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"SD kartının bağlantısını kes"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"USB depolama biriminin bağlantısını keserseniz, kullanmakta olduğunuz bazı uygulamalar durur ve USB depolama birimi yeniden bağlanıncaya kadar kullanılamayabilir."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"SD kartı çıkarırsanız, kullanmakta olduğunuz bazı uygulamalar durur ve SD kart yeniden takılıncaya kadar kullanılamayabilir."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"USB depl birm bağln kesilemedi"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"SD kartın bağlantısı kesilemedi"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"USB depolama biriminin bağlantısı kesilemiyor. Daha sonra tekrar deneyin."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"SD kartın bağlantısı kesilemiyor. Daha sonra yeniden deneyin."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB depolama biriminin bağlantısı kesilecek."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD kart bağlantısı kesilecek."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Kaldırılıyor"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Kaldırma işlemi devam ediyor"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Pil durumu"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Varsayılan APN ayarlarını sıfırlama tamamlandı"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrika verilerine sıfırla"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"Telefondaki tüm verileri siler"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"Bu, şunlar da dahil olmak üzere telefonunuzdaki tüm verileri silecektir:"\n<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verisi ve ayarları"</li>\n<li>"İndirilmiş uygulamalar"</li>\n"Şunlar silinmeyecektir:"\n<li>"Geçerli sistem yazılımı ve donanımla gelen uygulamalar"</li>\n<li>"Müzik veya resim gibi SD kart dosyaları"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Bu işlem, "<b></b>\n"Google hesabınız"\n<li></li>"Sistem ve uygulama verileri ve ayarları"\n<li></li>"İndirilen uygulamalar"\n<li></li>" da dahil olmak üzere telefonunuzun "\n"dahili depolama birimindeki"\n" tüm verilerin silinmesine neden olur. Bu telefondaki tüm verilerin silinmesi için "<b>"USB depolama biriminin"</b>" silinmesi gerekir."\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Bu işlem, "\n\n<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ve ayarları"</li>\n<li>"İndirilen uygulamalar"</li>\n\n" da dahil olmak üzere telefonunuzun "<b>"dahili depolama birimindeki"</b>" tüm verilerin silinmesine neden olur. Müzik, resimler ve diğer kullanıcı verilerinin de silinmesi için "<b>"SD kartın"</b>" silinmesi gerekir."\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB depolama birimini sil"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD kartı sil"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Telefonunun USB depolama birimindeki müzik veya foto gibi tüm veriler silinir."</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Telefonunun SD kartındaki müzik ve foto gibi tüm veriler silinir."</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"Telefonu sıfırla"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Tüm kişisel bilgilerinizi ve indirilen tüm uygulamaları silmek istiyor musunuz? Bu işlem geri döndürülemez!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Her şeyi sil"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Kilit açma deseninizi çizin"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Telefon sıfırlamayı onaylamak için kilit açma deseninizi çizmelisiniz."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Sistem Temizleme hizmeti kullanılamadığından sıfırlama yapılmadı."</string>
-    <string name="media_format_title" msgid="4671276096695789895">"SD kartı biçimlendir."</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"SD karttaki tüm verileri siler"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"Bu işlem telefondaki SD kartı siler. Karttaki TÜM verileri kaybedersiniz!"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"SD kartı biçimlendir"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"SD kartı, üzerindeki tüm medya verileriniz silinerek biçimlendirilsin mi? İşlem geri alınamaz!"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB depolama birimini sil"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"SD kartı sil"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB dep brmdki tüm verlr siler"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"SD karttaki tüm verileri siler"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Bu işlem, USB depolama biriminin silinmesine neden olur. Burada saklanan "<b>"tüm"</b>" verileri kaybedersiniz!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Bu işlem SD kartı siler. Karttaki "<b>"tüm"</b>" verileri kaybedersiniz!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"USB depolama birimini sil"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"SD kartı sil"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"USB dep br silinsin mi? Dep brmdde saklanan tüm dosylr silinir. Geri alınamaz!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"SD kart silinsin mi? Burada saklanan tüm dosyalar silinir. Geri alınamaz!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Her şeyi sil"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Kilit açma deseninizi çizin"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"Bir SD kart biçimini onaylamak için kilit açma deseninizi çizmelisiniz."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"USB depolama birimini biçimlendirmek istediğinizi onaylamak için kilit açma deseninizi çizmelisiniz."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"SD kartı silmek istediğinizi onaylamak için kilit açma deseninizi çizmelisiniz."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Çağrı ayarları"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Sesli mesaj, çağrı yönlendirme ve bekletme, arayan kimliğini ayarla"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB internet paylaşımı"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetooth internet paylaşımı oluşturma hatası"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"En çok <xliff:g id="MAXCONNECTION">%1$d</xliff:g> cihaz için intrnt paylş oluşturulabilir"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> internet paylaşımı kesilecek."</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"Bluetooth internet paylaşımı ayarları"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"İnternet paylaşımında bulunulacak Bluetooth cihazlarını seçin"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Yardım"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobil ağlar"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Dolaşım, şebeke, APN seçeneklerini ayarla"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Desteklenen GPS kullan"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS\'ye destek olmak için sunucu kullan (ağ kullanımını azaltmak için onay işaretini kaldırın)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS\'ye yardımcı olmak için sunucu kullan (GPS performansını iyileştirmek için onay işaretini kaldırın)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"Konumum\'u Kullan"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"Telefon hakkında"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"Yasal bilgileri, telefon durumunu, yazılım sürümünü görüntüle"</string>
     <string name="legal_information" msgid="5769301644270604095">"Yasal bilgiler"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"Bilinmiyor"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ada göre sırala"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Boyuta göre sırala"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Çalışan hizmetleri göster"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Önbllğe alınan işlm göstr"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Alanı yönet"</string>
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Filtre seçeneklerini belirle"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Tümü"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"İndirilen"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Çalışıyor"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"SD kartta"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB depolama birimi"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartta"</string>
     <string name="disabled" msgid="9206776641295849915">"Devre dışı"</string>
     <string name="no_applications" msgid="5190227407135243904">"Uygulama yok."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Dahili dep brm"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB dep birimi"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD kart dep brm"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Boyut yeniden hesaplanıyor…"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Sil"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Bu uygulamanın tüm verileri kalıcı olarak silinecek. Bu veriler arasında tüm dosyalar, ayarlar, hesaplar, veritabanları vs. yer alıyor."</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"sürüm <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Taşı"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"Telefona taşı"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"SD karta taşı"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB depl birimine taşı"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD karta taşı"</string>
     <string name="moving" msgid="6431016143218876491">"Taşınıyor"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Yeterli depolama alanı kalmadı."</string>
     <string name="does_not_exist" msgid="837163572898468245">"Uygulama mevcut değil."</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Tercih edilen yükleme konumu"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Yeni uygulamalar için tercih edilen yükleme konumunu değiştirin."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Depolama kullanımı"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Uygulamalar tarafından kullanılan depolama alanını görüntüle"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Çalışan hizmetler"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Şu anda çalışan hizmetleri görüntüleyin ve denetleyin"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Yeniden başlatılıyor"</string>
+    <string name="cached" msgid="1059590879740175019">"Önblğe alınan arka plan işlemi"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Hiçbir şey çalışmıyor."</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"Uygulama tarafından başlatıldı."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> uygun"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> kullanımda"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> boş"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> kull."</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> işlem ve <xliff:g id="NUMSERVICES">%2$d</xliff:g> hizmet"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"Ayarlar"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"Bu hizmet, uygulaması tarafından başlatıldı. Hizmetin durdurulması uygulamanın başarısız olmasına neden olabilir."</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Bu uygulama güvenli bir şekilde durdurulamıyor. Bu, bazı mevcut işlerinizin kaybına neden olabilir."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Bu, tekrar ihtiyaç duyl halinde daha yüksek hız elde etmek için kullanılan eski bir uyg işlemidir. Genellikle bunu durdurmanız gerekmez."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: şu anda kullanılıyor. Kontrol etmek için Ayarlar\'a dokunun."</string>
     <string name="main_running_process_description" msgid="929204645380391397">"Kullanımda olan ana işlem."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"<xliff:g id="COMP_NAME">%1$s</xliff:g> hizmeti kullanımda."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Sağlayıcı <xliff:g id="COMP_NAME">%1$s</xliff:g> kullanımda."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Sis hiz durdrlsn mu?"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Bu sistem hiz durdurulmasını istediğinize emin misiniz? Durdurulursa, telefonunuzun bazı özellikleri, telfn kapatılıp yeniden açılmadan düzgün çalışmayabilir."</string>
     <string name="language_settings" msgid="502219872342167227">"Dil ve klavye"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Dil ve klavye ayarları"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Dil ayarları"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Klavye ayarları"</string>
     <string name="phone_language" msgid="1165758957501090679">"Dil seçin"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Otomatik değiştir"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"Giriş yöntemi"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"Metin giriş seçeneklerini yönet"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> ayarları"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekran klavyesi ayarları"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"Cihaz klavyesi"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"Yerleşik klavye ayarları"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Yerleşik klavye"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Yerleşik, fiziksel klavye ayarları"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"Geliştirme"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Uygulama geliştirme için seçenekleri ayarla"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB hata ayıklaması"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Bu erişebilirlik hizmeti, şifreler hariç ve kişisel veriler, kredi kartı numaraları dahil olmak üzere yazdığınız tüm metinleri toplayabilir. Kullanıcı arayüzü etkileşimlerinizin kaydını da tutabilir. <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> uygulamasından gelmektedir. Bu erişebilirlik hizmetini kullanmak istiyor musunuz?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Erişilebilirlik devre dışı bırakılsın mı?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Erişilebilirlikle ilgili uygulama bulunamadı"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Erişilebilirlikle ilgili yüklü herhangi bir uygulamanız yok."\n\n"Android Market\'ten cihazınız için bir ekran okuyucu indirebilirsiniz."\n\n"Ekran okuyucuyu yüklemek için Tamam düğmesini tıklayın."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Erişilebilirlik komut dsy"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Erişilebilirlik komut dosyalarını indir"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Uyg., Google\'dan erişilebilirlik komut dosyaları indirms izin ver"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"Bazı uygulamalar, içeriklerinin daha erişilebilir olması için Google\'dan telefonunuza komut dosyaları indirmesini isteyebilir. Google\'ın telefonunuza erişilebilirlik komut dosyaları yüklemesine izin vermek istediğinizden emin misiniz?"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Güç düğmesi"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Güç düğmesi çağrıyı sonlandırır"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Çağrı sırasında, Güç düğmesine basıldığında ekranın kapanması yerine çağrı sonlanır"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Şarj oluyor"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ekran açık"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS açık"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Kablosuz"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Kablosuz"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Uyanık"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefon sinyali"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Cihazın açılma zamanı"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"Kablosuz özelliğinin açık olduğu süre"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"Kablosuz özelliğinin açık olduğu süre"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Zamnnd kablsz"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Zamnnd kablsz"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"Pil kullanım bilgileri"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Ayrıntıları kullan"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön planı"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Uyanık tut"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Kablosuz çalışıyor"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Gönderilen veriler"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Alınan veriler"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"Uygulama bilgileri"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Uygulama ayarları"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"Ekran ayarları"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"Kablosuz ayarları"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Kablosuz ayarları"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth ayarları"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Sesli aramalar tarafından kullanılan pil"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"Telefon boştayken kullanılan pil"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"Uygulamaların güvenli sertifikalara ve diğer kimlik bilgilerine erişmesine izin verin"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Şifreyi girin"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Kimlik bilgileri deposunun şifresini girin."</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"SD karttan yükle"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"SD karttan şifrelenmiş sertifikaları yükleyin"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"USB dep biriminden yükle"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"SD karttan yükle"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"USB dep br şifr srtfk ykl"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"SD karttan şifrelenmiş sertifikaları yükleyin"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"Şifreyi ayarla"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"Kimlik bilgileri deposunun şifresini ayarlayın veya değiştirin"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"Depoyu temizle"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"Yedekleme ve geri yükleme"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Kişisel veriler"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Verilerimi yedekle"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"Ayarlarımı ve diğer uygulama verilerimi yedekle."</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Uyg verilerini, kablsz kulnm şifre ve diğ ayarları Google sunuclrnda yedekleyin"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Otomatik geri yükle"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"Bir uygulamayı yeniden yüklersem, yedeklenen ayarları veya diğer verileri geri yükle."</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Bir uyg\'ı tekr yüklersem, yedeklenen ayarlr veya diğr verilr geri yükle"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Yedekle"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"Ayarlarınızın ve uygulama verilerinizin yedeklenmesini durdurmak ve Google sunucularındaki tüm kopyaları silmek istediğinizden emin misiniz?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Kablsz şifrelernzn, yer işaretlerinzn ve diğ ayarlrnz ile uyg verilernzn yedeklnmsn durdurmak ve Google sunclrndki tüm kopylr silmek istdğn emin misiniz?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Aygıt yönetimi ayarları"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Cihaz yöneticisi"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Etkinliğini Kaldır"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Listeyi yenile"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Atla"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"İleri"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Ağlar taranıyor..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"Ağ seçmek için dokunun"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Mevcut ağa bağlan"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Ağ yapılandırmasını girin"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Yeni ağa bağlan"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Bağlanıyor..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"Bağlı"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Sonraki adıma ilerle"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Şu anda senkronizasyon sorunları yaşanıyor. Kısa süre sonra düzeltilecek."</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Hesap ekle"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Genel senk. ayarları"</string>
+    <string name="background_data" msgid="5779592891375473817">"Arka plan veri"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Uyg., istediğiniz zaman verileri senk eder, gönderir ve alır"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Dikkat"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Arka plan verilerini devre dışı bırakmak, pilden tasarruf sağlar ve veri kullanımını azaltır. Bazı uygulamalar yine de arka plan veri bağlantısını kullanmaya devam edebilir."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Otomatik senkronizasyon"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Uygulamalar verileri otomatik olarak senkronize eder"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Hesapları yönetin"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Senkronizasyon AÇIK"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Senkronizasyon KAPALI"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Senk. hatası"</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index b3c3fda..3b7099f 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"静态"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"关"</item>
     <item msgid="3165868966179561687">"警报"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8546586..1b99c7c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"卸载 SD 卡"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"格式化 SD 卡"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"卸载 USB 存储设备"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"卸载 SD 卡"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"格式化 USB 存储设备"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"格式化 SD 卡"</string>
     <string name="small_font" msgid="2295331917424072635">"小"</string>
     <string name="medium_font" msgid="2068475425515133701">"中"</string>
     <string name="large_font" msgid="599055175160971446">"大"</string>
     <string name="font_size_save" msgid="3450855718056759095">"确定"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"SD 卡"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB 存储设备"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD 卡"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"电池状态："</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"是否已插电："</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"电池电量："</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"没电"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"过电压"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知错误"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"蓝牙"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"可检测性"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒内可检测到..."</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"启动<xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"帐户:"</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"代理设置"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"设置全局 HTTP 代理和排除列表"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"端口"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"以下对象没有代理："</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"恢复默认设置"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"完成"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"主机名"</string>
     <string name="proxy_error" msgid="8926675299638611451">"注意"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"确定"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"您输入的主机名无效。"</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"您键入的排除列表的格式不正确。请输入以逗号分隔的排除域的列表。"</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"您必须填写端口字段。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"如果主机字段为空，则端口字段必须为空。"</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"您输入的端口无效。"</string>
@@ -187,18 +187,23 @@
     <string name="band_mode_failed" msgid="1495968863884716379">"失败"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"成功"</string>
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"重新连接 USB 线后更改生效"</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"启用 USB 大容量存储模式"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"启用 USB 大容量存储设备"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"总字节数："</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"无 SD 卡"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"未装载 USB 存储设备"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"无 SD 卡"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"可用的字节数："</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"SD 卡已被视为大容量存储设备"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"现在可以安全移除 SD 卡"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"SD 卡仍在使用中便被移除！"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB 存储设备已被用作大容量存储设备"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD 卡已被视为大容量存储设备"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"现在可以安全移除 USB 存储设备了"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"现在可以安全移除 SD 卡"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB 存储设备仍在使用中便被移除！"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD 卡仍在使用中便被移除！"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"已使用的字节数："</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"正从 SD 卡扫描媒体..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"安装的 SD 卡为只读状态"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在扫描 USB 存储设备中的媒体..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"正从 SD 卡扫描媒体..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"已将 USB 存储设备装载为只读设备"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"安装的 SD 卡为只读状态"</string>
+    <string name="skip_label" msgid="47510779345218297">"跳过"</string>
     <string name="next_label" msgid="4693520878012668114">"下一步"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"语言"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"选择活动"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"电池信息"</string>
     <string name="display_label" msgid="7403874003169865762">"显示"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"手机信息"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"SD 卡"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB 存储设备"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD 卡"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"代理设置"</string>
     <string name="cancel" msgid="6859253417269739139">"取消"</string>
     <string name="settings_label" msgid="1626402585530130914">"设置"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"设置"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"设置"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"飞行模式"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"停用所有无线连接"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"选择网络运营商"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期和时间"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"设置日期、时间、时区和格式"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"自动确定日期和时间"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"使用网络上的时间"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"使用网络上的时间"</string>
+    <string name="zone_auto" msgid="334783869352026648">"自动确定时区"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"使用网络上的时区"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"使用网络上的时区"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"使用 24 小时格式"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"设置时间"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"选择时区"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"按时区排序"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"超时后锁定设备"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"调整设备自动锁定前的延迟时间"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"位置和安全"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"位置和安全设置"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"确定"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"取消"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"设备管理"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"选择设备管理器"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"添加或删除设备管理器"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"选择设备管理器"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"添加或删除设备管理器"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"蓝牙"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"打开蓝牙"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"蓝牙设置"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"将底座用作免提电话"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"用于音乐和媒体"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"记住设置"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"使用近距离通信读取和交换标签"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"打开 Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi 设置"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"连接到网络"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"不保存网络"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改网络"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"网络设置"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"从接入点输入 PIN"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"网络 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"身份"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名身份"</string>
     <string name="wifi_password" msgid="5948219759936151048">"密码"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"显示密码"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP 设置"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"（未更改）"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"（未指定）"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"已保存"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"已停用"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"不在范围内"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"通过 <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> 进行保护"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"通过 <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> 进行保护"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"通过 <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>（WPS 可用）确保安全"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>，通过 <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> 进行保护"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"连接"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"不保存"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP 设置"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"保存"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"取消"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"请输入有效的 IP 地址。"</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"域名 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"域名 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"网关"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"网络掩码"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"便携式 Wi-Fi 热点"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"便携式热点 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已启用"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"便携式 Wi-Fi 热点错误"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"状态消息"</string>
     <string name="device_status" msgid="607405385799807324">"状态消息"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"电话号码、信号等"</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"卸载 SD 卡，查看可用存储设备"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"共享存储设备和安全存储"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"存储"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"存储设置"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"卸载 USB 存储设备，查看可用存储设备"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"卸载 SD 卡，查看可用存储设备"</string>
     <string name="status_number" msgid="5123197324870153205">"本机号码"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL 版本"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"不可用"</string>
     <string name="status_up_time" msgid="7294859476816760399">"开机时间"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"唤醒时间"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"手机内存"</string>
-    <string name="sd_memory" msgid="151871913888051515">"SD 卡"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"内部存储设备"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 存储设备"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD 卡"</string>
     <string name="memory_available" msgid="418542433817289474">"可用空间"</string>
     <string name="memory_size" msgid="6629067715017232195">"总容量"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"卸载 SD 卡"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"必须先卸载 SD 卡，才能将其安全移除"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"卸载共享存储设备"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"卸载 SD 卡"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"卸载内部 USB 存储设备"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"需要先卸载 SD 卡，然后才能将其安全移除"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"启用 PTP 模式"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"在通过 USB 连接时显示为 PTP 相机设备，而不是 MTP 设备"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"插入 SD 卡进行安装"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"安装 SD 卡"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"安装 SD 卡"</string>
-    <string name="sd_format" msgid="5448738337382712203">"格式化 SD 卡"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"格式化（清除）SD 卡"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"插入要装载的 USB 存储设备"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"插入 SD 卡进行安装"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"装载共享存储设备"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"安装 SD 卡"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"装载内部 USB 存储设备"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"安装 SD 卡"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"格式化 USB 存储设备"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"格式化 SD 卡"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"清除手机的内部 USB 存储设备中的全部数据，例如音乐和照片"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"清除手机的 SD 卡中的全部数据，例如音乐和照片"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"不可用"</string>
     <string name="read_only" msgid="6702420168629076340">" （只读）"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"卸载 SD 卡"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"如果您卸载 SD 卡，则您当前使用的某些应用程序会停止，而且在您重新安装 SD 卡前可能都无法使用。"</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"无法卸载 SD 卡"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"无法卸载 SD 卡，请稍后重试。"</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"系统将要卸载 SD 卡。请在通知区域查看状态。"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"卸载 USB 存储设备"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"卸载 SD 卡"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"如果您卸载 USB 存储设备，则您当前使用的某些应用程序会停止，而且在您重新装载 USB 存储设备前可能都无法使用。"</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"如果您卸载 SD 卡，则您当前使用的某些应用程序会停止，而且在您重新安装 SD 卡前可能都无法使用。"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"卸载 USB 存储设备时失败"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"无法卸载 SD 卡"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"无法卸载 USB 存储设备。请稍后再试。"</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"无法卸载 SD 卡，请稍后重试。"</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"系统将会卸载 USB 存储设备。"</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"系统将会卸载 SD 卡。"</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"正在卸载"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"正在卸载"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"电池状态"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"重置默认 APN 设置已完成"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"恢复出厂设置"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"清除手机上的所有数据"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"这会从手机中删除所有数据，包括："\n<li>"Google 帐户"</li>\n<li>"系统与应用程序的数据和设置"</li>\n<li>"下载的应用程序"</li>\n"不会删除："\n<li>"当前系统软件和捆绑的应用程序"</li>\n<li>"SD 卡文件，如音乐或照片"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"这会清除您手机的"<b>"内部存储设备"</b>"中的全部数据，包括："\n\n<li>"您的 Google 帐户"</li>\n<li>"系统和应用程序数据和设置"</li>\n<li>"已下载的应用程序"</li>\n\n"要清除手机中的全部数据，请格式化 "<b>"USB 存储设备"</b>"。"\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"这会清除您手机的"<b>"内部存储设备"</b>"中的全部数据，包括："\n\n<li>"您的 Google 帐户"</li>\n<li>"系统和应用程序数据和设置"</li>\n<li>"已下载的应用程序"</li>\n\n"要清除音乐、照片和其他用户数据，请格式化 "<b>"SD 卡"</b>"。"\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"格式化 USB 存储设备"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"格式化 SD 卡"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"清除手机的内部 USB 存储设备中的全部数据，例如音乐或照片。"</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"清除手机的 SD 卡中的全部数据，例如音乐或照片。"</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"重置手机"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"是否删除所有个人信息和下载的所有应用程序？此操作无法还原！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部内容"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"绘制您的解锁图案"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"您必须绘制解锁图案才能确认重置手机。"</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"未执行重置，因为系统清除服务不可用。"</string>
-    <string name="media_format_title" msgid="4671276096695789895">"格式化 SD 卡。"</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"清除 SD 卡上的所有数据"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"该操作会清除手机中 SD 卡上的数据。卡上的所有数据都将丢失。"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"格式化 SD 卡"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"确定要将 SD 卡格式化、清除所有媒体吗？该操作将不能撤消！"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"格式化 USB 存储设备"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"格式化 SD 卡"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"清除 USB 存储设备中的全部数据"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"清除 SD 卡上的所有数据"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"此操作会格式化 USB 存储设备，会让您丢失其中存储的"<b>"全部"</b>"数据！"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"此操作会格式化 SD 卡，会让您丢失其中存储的"<b>"全部"</b>"数据！"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"格式化 USB 存储设备"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"格式化 SD 卡"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"确定要格式化 USB 存储设备，删除其中存储的全部文件吗？该操作将无法撤消！"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"确定要格式化 SD 卡，删除其中存储的全部文件吗？该操作将无法撤消！"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"清除全部内容"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"绘制您的解锁图案"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"您必须绘制解锁图案以确认将 SD 卡格式化。"</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"您必须绘制解锁图案，以确认对 USB 存储设备执行格式化操作。"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"您必须绘制解锁图案，以确认对 SD 卡执行格式化操作。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通话设置"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"设置语音信箱、来电转接、来电等待和本机号码显示"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 绑定"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"蓝牙绑定出错"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"无法绑定到 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 台以上的设备"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"即将解除与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的绑定。"</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"蓝牙绑定设置"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"选择要绑定的蓝牙设备"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"帮助"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"移动网络"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"设置漫游、网络、APN 选项"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"使用增强型 GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"使用服务器来辅助 GPS（取消选中可降低网络使用率）"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"使用服务器来辅助 GPS（取消选中可提高 GPS 性能）"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"使用“我的位置”"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"关于手机"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"查看法律信息、手机状态和软件版本"</string>
     <string name="legal_information" msgid="5769301644270604095">"法律信息"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"未知"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"按姓名排序"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"按大小排序"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"显示当前运行的服务"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"显示缓存进程"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"管理空间"</string>
     <string name="filter" msgid="2018011724373033887">"过滤"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"选择过滤选项"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"全部"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"已下载"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"正在运行"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"SD 卡中"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 存储设备"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD 卡中"</string>
     <string name="disabled" msgid="9206776641295849915">"已停用"</string>
     <string name="no_applications" msgid="5190227407135243904">"无应用程序。"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"内部存储设备"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 存储设备"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD 卡存储设备"</string>
     <string name="recompute_size" msgid="7722567982831691718">"正在重新计算大小..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"删除"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"此应用程序的所有数据将被永久删除。删除的内容包括所有文件、设置、帐户、数据库等。"</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"移动"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"移至手机内存"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"移至 SD 卡"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"移至 USB 存储设备"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"移至 SD 卡"</string>
     <string name="moving" msgid="6431016143218876491">"正在移动"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"存储空间不足。"</string>
     <string name="does_not_exist" msgid="837163572898468245">"该应用程序不存在。"</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"首选安装位置"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"更改安装新应用程序时使用的首选安装位置"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"存储空间使用情况"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"查看应用程序所用的存储空间"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在运行的服务"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"查看和控制当前正在运行的服务"</string>
     <string name="service_restarting" msgid="2242747937372354306">"正在重新启动"</string>
+    <string name="cached" msgid="1059590879740175019">"缓存的后台进程"</string>
     <string name="no_running_services" msgid="2059536495597645347">"当前未运行任何服务。"</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"已由应用程序启动。"</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> 可用"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"已使用 <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"可用空间：<xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"已用空间：<xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 个进程和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 个服务"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"设置"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"此服务由其应用程序启动。停止服务可能会导致应用程序失败。"</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"无法安全地停止该应用程序。强行停止可能会导致您目前的部分工作内容丢失。"</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"这是旧应用程序进程，用于保持手机的快速运行，以防随时需要。通常不建议停止。"</string>
     <string name="service_manage_description" msgid="7050092269951613102">"目前正在使用“<xliff:g id="CLIENT_NAME">%1$s</xliff:g>”。触摸“设置”可以对其进行控制。"</string>
     <string name="main_running_process_description" msgid="929204645380391397">"正在使用的主要进程。"</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"正在使用服务<xliff:g id="COMP_NAME">%1$s</xliff:g>。"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"正在使用提供商<xliff:g id="COMP_NAME">%1$s</xliff:g>。"</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"要停止系统服务吗？"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"确定要停止此系统服务吗？如果停止，您手机上的某些功能也会立即停止工作，除非您将其关闭后再重新打开。"</string>
     <string name="language_settings" msgid="502219872342167227">"语言和键盘"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"语言和键盘设置"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"语言设置"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"键盘设置"</string>
     <string name="phone_language" msgid="1165758957501090679">"选择语言"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"自动替换"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"输入法"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"管理文字输入选项"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 设置"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"屏幕键盘设置"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"设备键盘"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"内置键盘设置"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"内置键盘"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"内置物理键盘设置"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"开发"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"设置应用程序开发选项"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 调试"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"此辅助服务能够收集键入的所有文字，包括除密码以外的个人资料，如信用卡号。该服务还会记录用户界面交互情况。该服务来自应用程序 <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>。是否使用此辅助服务？"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"是否停用辅助功能？"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"找不到与辅助功能相关的应用程序"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"您没有安装任何与辅助功能相关的应用程序。"\n\n"您可以从 Android 电子市场下载适用于您设备的屏幕阅读器。"\n\n"点击“确定”即可安装屏幕阅读器。"</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"辅助功能脚本"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"下载辅助功能脚本"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"允许应用程序从 Google 下载辅助功能脚本"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"某些应用程序会要求 Google 将脚本下载到您的手机上，以便让用户更方便地访问这些应用程序的内容。您确定允许 Google 在您的手机上安装辅助功能脚本吗？"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"“电源”按钮"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"按“电源”按钮结束通话"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"通话时，按下“电源”将结束通话而不是关闭屏幕"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"正在充电"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"屏幕已开启"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS 已启用"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"唤醒"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"手机信号强度"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"设备唤醒时间"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"WiFi 开启时间"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"WiFi 开启时间"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi 开启时间"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi 开启时间"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"电量使用详情"</string>
     <string name="details_subtitle" msgid="32593908269911734">"详细使用情况"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU（前台）"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持唤醒状态"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi 正在运行"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"通话"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"数据已发送"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"数据已收到"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"应用程序信息"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"应用程序设置"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"显示设置"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"WiFi 设置"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi 设置"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"蓝牙设置"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"语音通话所耗的电量"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"手机待机时所耗的电量"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"允许应用程序访问安全凭证和其他凭证"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"输入密码"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"输入凭证存储密码。"</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"从 SD 卡安装"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"从 SD 卡安装加密的证书"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"从 USB 存储设备安装"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"从 SD 卡安装"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"从 USB 存储设备安装已加密的证书"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"从 SD 卡安装加密的证书"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"设置密码"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"设置或更改凭证存储密码"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"清除存储"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"备份和还原"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"个人数据"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"备份我的数据"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"备份我的设置和其他应用程序数据。"</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"将应用程序数据、Wi-Fi 密码和其他设置备份至 Google 服务器"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自动还原"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"重新安装某个应用程序后，系统会还原已经备份的设置或其他数据。"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"重新安装某个应用程序后，系统会还原已经备份的设置或其他数据"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"备份"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"您是否确定要停止备份您的设置和应用程序数据，并清除 Google 服务器上的所有副本？"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"确定要停止备份您的 Wi-Fi 密码、书签以及其他设置和应用程序数据，并清除 Google 服务器上的所有副本吗？"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"设备管理设置"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"设备管理器"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"取消激活"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"刷新列表"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"跳过"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"下一步"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"正在查找网络..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"触摸以选择网络"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"连接到现有网络"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"输入网络配置"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"连接到新的网络"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"正在连接..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"已连接"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"继续下一步"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"同步操作当前遇到了一些问题，很快便可恢复。"</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"添加帐户"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"常规同步设置"</string>
+    <string name="background_data" msgid="5779592891375473817">"背景数据"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"应用程序可以随时同步、发送和接收数据"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"注意"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"停用背景数据可延长电池使用时间并减少数据使用量。但某些应用程序可能仍会使用背景数据连接。"</string>
     <string name="sync_automatically" msgid="7558810110682562376">"自动同步"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"应用程序自动同步数据"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"管理帐户"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"同步功能已开启"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"同步功能已关闭"</string>
+    <string name="sync_error" msgid="5060969083117872149">"同步出错"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 6d1b526..b6bd449 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -142,11 +142,13 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
-    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
-    <!-- no translation found for wifi_network_setup:2 (2300067170366116017) -->
-    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
-    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"靜態"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (6267482274276126058) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"關閉"</item>
     <item msgid="3165868966179561687">"警示"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 15c81c9..8d4b790 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -45,13 +45,16 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"客戶編號"</string>
-    <string name="sdcard_unmount" msgid="3364184561355611897">"卸載 SD 卡"</string>
-    <string name="sdcard_format" msgid="362497552060004057">"將 SD 卡格式化"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"無法卸載 USB 儲存裝置"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"卸載 SD 卡"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"清除 USB 儲存裝置"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"清除 SD 卡"</string>
     <string name="small_font" msgid="2295331917424072635">"小"</string>
     <string name="medium_font" msgid="2068475425515133701">"中"</string>
     <string name="large_font" msgid="599055175160971446">"大"</string>
     <string name="font_size_save" msgid="3450855718056759095">"確定"</string>
-    <string name="sdcard_setting" msgid="5922637503871474866">"SD 卡"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB 儲存裝置"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD 卡"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"電池狀態："</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"電源插頭："</string>
     <string name="battery_info_scale_label" msgid="3649763192389778437">"電池存量："</string>
@@ -84,6 +87,8 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"電池耗盡"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"電壓過高"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知的錯誤"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"藍牙"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"可偵測性"</string>
     <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"可供偵測 <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒..."</string>
@@ -130,23 +135,18 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"開始 <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>："</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"帳戶："</string>
-    <!-- no translation found for proxy_settings_title (6262282922722097473) -->
-    <skip />
-    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="6262282922722097473">"Proxy 設定"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"設定全域 HTTP Proxy 和排除清單"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
     <string name="proxy_port_label" msgid="2623639656638472491">"連接埠"</string>
-    <!-- no translation found for proxy_exclusionlist_label (204409815790850313) -->
-    <skip />
+    <string name="proxy_exclusionlist_label" msgid="204409815790850313">"排除以下網域的 Proxy："</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"還原預設值"</string>
-    <!-- no translation found for proxy_action_text (2957063145357903951) -->
-    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"完成"</string>
     <string name="proxy_hostname_label" msgid="7531298584350977540">"主機名稱"</string>
     <string name="proxy_error" msgid="8926675299638611451">"注意"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"確定"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"您輸入的主機名稱無效。"</string>
-    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
-    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"您所輸入的排除清單格式有誤，請輸入以逗點分隔的排除網域清單。"</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"您必須輸入連接埠欄位。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"若主機欄位空白，連接埠欄位也須空白。"</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"您輸入的連接埠無效。"</string>
@@ -189,16 +189,21 @@
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"USB 纜線重新連接時，變更才會生效"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"啟用 USB 大量儲存裝置"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"總容量 (bytes)："</string>
-    <string name="sdcard_settings_not_present_status" msgid="6666688653496819947">"沒有 SD 卡"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"未掛接 USB 儲存裝置"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"沒有 SD 卡"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"可用容量 (bytes)："</string>
-    <string name="sdcard_settings_mass_storage_status" msgid="4786433969313661655">"SD 卡已視為 USB 大量儲存裝置"</string>
-    <string name="sdcard_settings_unmounted_status" msgid="3812022095683863087">"您現在可以放心移除 SD 卡"</string>
-    <string name="sdcard_settings_bad_removal_status" msgid="5145797653495907970">"SD 卡仍在使用時便被移除！"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB 儲存裝置目前作為大量儲存裝置使用"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD 卡已視為 USB 大量儲存裝置"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"現在可以安全移除 USB 儲存裝置了"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"您現在可以放心移除 SD 卡"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB 儲存裝置在使用期間遭到移除！"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD 卡仍在使用時便被移除！"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"使用容量 (bytes)："</string>
-    <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"從 SD 卡掃描媒體中..."</string>
-    <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"SD 卡為唯讀狀態"</string>
-    <!-- no translation found for skip_label (47510779345218297) -->
-    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在掃描媒體的 USB 儲存裝置..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"從 SD 卡掃描媒體中..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"以唯讀形式掛接 USB 儲存裝置"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD 卡為唯讀狀態"</string>
+    <string name="skip_label" msgid="47510779345218297">"略過"</string>
     <string name="next_label" msgid="4693520878012668114">"下一頁"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"語言"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"選取動作"</string>
@@ -206,10 +211,12 @@
     <string name="battery_info_label" msgid="4132685016148679403">"電池資訊"</string>
     <string name="display_label" msgid="7403874003169865762">"顯示"</string>
     <string name="phone_info_label" msgid="2127552523124277664">"手機資訊"</string>
-    <string name="sd_card_settings_label" msgid="5743100901106177102">"SD 卡"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB 儲存裝置"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD 卡"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy 設定"</string>
     <string name="cancel" msgid="6859253417269739139">"取消"</string>
     <string name="settings_label" msgid="1626402585530130914">"設定"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
     <string name="settings_shortcut" msgid="3672145147925639262">"設定"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"飛航模式"</string>
     <string name="airplane_mode_summary" msgid="3154817401368780988">"停用所有的無線網路連線"</string>
@@ -229,18 +236,12 @@
     <string name="sum_carrier_select" msgid="6648929373316748020">"選取電信業者"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期與時間"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"設定日期、時間、時區與格式"</string>
-    <!-- no translation found for date_time_auto (7076906458515908345) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
-    <skip />
-    <!-- no translation found for zone_auto (334783869352026648) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
-    <skip />
-    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
-    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"自動判定日期和時間"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"使用網路提供的時間"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"使用網路提供的時間"</string>
+    <string name="zone_auto" msgid="334783869352026648">"自動判定時區"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"使用網路提供的時區"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"使用網路提供的時區"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"使用 24 小時格式"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"設定時間"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"選取時區"</string>
@@ -250,6 +251,10 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"依時區排序"</string>
     <string name="lock_after_timeout" msgid="9100576335787336455">"發生逾時錯誤時鎖定裝置"</string>
     <string name="lock_after_timeout_summary" msgid="5751027735105958453">"調整裝置自動鎖定所需的延遲時間"</string>
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"位置與安全性"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"位置與安全性設定"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
@@ -316,8 +321,8 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"確定"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"取消"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"裝置管理"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"選取裝置管理員"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"新增或移除裝置管理員"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"選取裝置管理員"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"新增或移除裝置管理員"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"藍牙"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"開啟藍牙"</string>
     <string name="bluetooth_settings" msgid="2725796451253089609">"藍牙設定"</string>
@@ -376,6 +381,11 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"當成手機喇叭"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"使用於音樂與媒體"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"記住設定"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"使用近距離無線通訊讀取和交換標記"</string>
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"開啟 Wi-Fi"</string>
     <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi 設定"</string>
@@ -395,9 +405,11 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"連線至網路"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"清除網路"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改網路"</string>
-    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <string name="wifi_network_setup" msgid="7974851890019344870">"網路設定"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"從存取點輸入 Pin"</string>
+    <!-- no translation found for wifi_wps_pin_method_configuration (9019042137789692817) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"網路 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
@@ -412,18 +424,17 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"識別"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名識別"</string>
     <string name="wifi_password" msgid="5948219759936151048">"密碼"</string>
-    <!-- no translation found for wifi_show_password (6461249871236968884) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
-    <skip />
+    <string name="wifi_show_password" msgid="6461249871236968884">"顯示密碼"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP 設定"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(未變更)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(未指定)"</string>
     <string name="wifi_remembered" msgid="8426719916135950136">"已記住"</string>
     <string name="wifi_disabled" msgid="2104752038187543712">"已停用"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"超出可用範圍"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"以 <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> 保護連線安全性"</string>
-    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
     <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"以 <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> 保護連線安全性"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"透過 <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> 加密保護 (WPS 可用)"</string>
     <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>，以 <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> 保護連線安全性"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"連線"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"清除"</string>
@@ -442,11 +453,19 @@
     <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP 設定"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"儲存"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"取消"</string>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"請輸入有效的 IP 位址。"</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"閘道"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"網路遮罩"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"可攜式 Wi-Fi 無線基地台"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"可攜式無線基地台 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已啟用"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"可攜式 Wi-Fi 無線基地台發生錯誤"</string>
@@ -558,11 +577,11 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"狀態"</string>
     <string name="device_status" msgid="607405385799807324">"狀態"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"電話號碼、訊號等。"</string>
-    <!-- no translation found for storage_settings (4211799979832404953) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (8746016738388094064) -->
-    <skip />
-    <string name="storage_settings_summary" msgid="9176693537325988610">"卸載 SD 卡，檢視可用儲存媒體。"</string>
+    <!-- outdated translation 6761505449439392808 -->     <string name="storage_settings" product="nosdcard" msgid="8758910337658683955">"共用和安全儲存的儲存空間"</string>
+    <string name="storage_settings" product="default" msgid="4211799979832404953">"儲存空間"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"儲存設定"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"卸載 USB 儲存裝置，瀏覽可用的儲存裝置"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"卸載 SD 卡，檢視可用儲存媒體。"</string>
     <string name="status_number" msgid="5123197324870153205">"我的電話號碼"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL 版本"</string>
@@ -578,26 +597,39 @@
     <string name="status_unavailable" msgid="7862009036663793314">"無法取得"</string>
     <string name="status_up_time" msgid="7294859476816760399">"開機時間"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"清醒時間"</string>
-    <string name="internal_memory" msgid="1130932766236387454">"手機內部記憶體"</string>
-    <string name="sd_memory" msgid="151871913888051515">"SD 卡"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"內存空間"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 儲存裝置"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD 卡"</string>
     <string name="memory_available" msgid="418542433817289474">"可用空間"</string>
     <string name="memory_size" msgid="6629067715017232195">"總空間"</string>
-    <string name="sd_eject" msgid="6915293408836853020">"卸載 SD 卡"</string>
-    <string name="sd_eject_summary" msgid="3315557796211542962">"必須先卸載 SD 卡，才能安全移除"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"卸載共用儲存裝置"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"卸載 SD 卡"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"卸載內部 USB 儲存裝置"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"請先卸載 SD 卡，才能將其安全移除"</string>
     <string name="ptp_mode" msgid="3954718349875117695">"啟用 PTP 模式"</string>
     <string name="ptp_mode_summary" msgid="8709697530987890394">"在 USB 介面中顯示為 PTP 相機裝置，而非 MTP 裝置"</string>
-    <string name="sd_insert_summary" msgid="2048640010381803841">"插入要掛載的 SD 卡"</string>
-    <string name="sd_mount" msgid="5940523765187704135">"掛載 SD 卡"</string>
-    <string name="sd_mount_summary" msgid="4936591681679097699">"掛載 SD 卡"</string>
-    <string name="sd_format" msgid="5448738337382712203">"將 SD 卡格式化"</string>
-    <string name="sd_format_summary" msgid="6616491027883134004">"將 SD 卡格式化 (清除)"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"插入用於掛接的 USB 儲存裝置"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"插入要掛載的 SD 卡"</string>
+    <!-- outdated translation 2160896630836199702 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"掛接共用儲存裝置"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"掛載 SD 卡"</string>
+    <!-- outdated translation 6733254203291665551 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"掛接內部 USB 儲存裝置"</string>
+    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"掛載 SD 卡"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"清除 USB 儲存裝置"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"清除 SD 卡"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"清除手機內部 USB 儲存裝置的所有資料，例如音樂和相片。"</string>
+    <string name="sd_format_summary" product="default" msgid="915849621390821841">"清除手機 SD 卡中的所有資料，例如音樂和相片"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"無法取得資訊"</string>
     <string name="read_only" msgid="6702420168629076340">" (唯讀)"</string>
-    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"卸載 SD 卡"</string>
-    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"如果您將 SD 卡退出，則您正在使用的某些應用程式會停止運作，而且可能無法使用，待您將 SD 卡重新插入才會恢復正常。"</string>
-    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"無法退出 SD 卡"</string>
-    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"無法退出 SD 卡。請稍後再試一次。"</string>
-    <string name="unmount_inform_text" msgid="3213378327712151498">"即將退出 SD 卡。請檢查通知區域，瞭解狀態。"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"無法卸載 USB 儲存裝置"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"卸載 SD 卡"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"如果您卸載 USB 儲存裝置，則某些正在使用中的應用程式會停止運作，而且可能無法使用，直到重新掛接 USB 儲存裝置之後才會恢復正常。"</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"如果您將 SD 卡退出，則您正在使用的某些應用程式會停止運作，而且可能無法使用，待您將 SD 卡重新插入才會恢復正常。"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"卸載 USB 儲存裝置失敗"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"無法退出 SD 卡"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"無法卸載 USB 儲存裝置，請稍候再試。"</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"無法退出 SD 卡。請稍後再試一次。"</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"即將卸載 USB 儲存裝置。"</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"即將卸載 SD 卡。"</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"正在取出"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"正在取出"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
@@ -637,21 +669,32 @@
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"重設預設 APN 設定已完成"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"重設為原廠設定"</string>
     <string name="master_clear_summary" msgid="4986154238001088492">"清除手機上所有資料"</string>
-    <string name="master_clear_desc" msgid="7823268823499739178">"這將清除您手機中的下列資料："\n<li>"您的 Google 帳戶"</li>\n<li>"系統與應用程式的資料和設定"</li>\n<li>"已下載的應用程式"</li>\n"不會清除下列資料："\n<li>"目前的系統軟體和附屬應用程式"</li>\n<li>"SD 卡中的檔案，例如音樂或相片"</li></string>
+    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"這會清除您手機"<b>"內存空間"</b>"中的所有資料，包括："\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li>\n\n"如要清除手機上的所有資料，則需清除 "<b>"USB 儲存裝置"</b>"。"\n\n</string>
+    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"這會清除您手機"<b>"內存空間"</b>"中的所有資料，包括："\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li>\n\n"如要一併清除音樂、相片及其他資料，則需清除 "<b>"SD 卡"</b>"。"\n\n</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"清除 USB 儲存裝置"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"清除 SD 卡"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"清除手機內部 USB 儲存裝置的所有資料，例如音樂或相片。"</string>
+    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"清除手機 SD 卡上的所有資料，例如音樂或相片。"</string>
     <string name="master_clear_button_text" msgid="7550632653343157971">"重設手機"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"要清除所有個人資料及先前下載的應用程式嗎？這個動作無法復原！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"畫出解鎖圖形"</string>
     <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"請畫出解鎖圖形，以確認重設手機。"</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"因「系統清除」服務異常，未成功執行重設。"</string>
-    <string name="media_format_title" msgid="4671276096695789895">"將 SD 卡格式化。"</string>
-    <string name="media_format_summary" msgid="3805714639375830120">"清除 SD 卡上的所有資料"</string>
-    <string name="media_format_desc" msgid="1142563222357820834">"此項操作將清除手機中 SD 卡上的資料。SD 卡上的全部資料將會消失！"</string>
-    <string name="media_format_button_text" msgid="370856400090190151">"將 SD 卡格式化"</string>
-    <string name="media_format_final_desc" msgid="1776666694910717198">"確定要將 SD 卡格式化、清除所有媒體嗎？此項操作將無法復原！"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"清除 USB 儲存裝置"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"清除 SD 卡"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"清除 USB 儲存裝置中的所有資料"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"清除 SD 卡上的所有資料"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"這項動作會清除 USB 儲存裝置，您將失去其中儲存的「所有」資料！"<b></b></string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"這項動作會清除 SD 卡，您將失去 SD 卡中的「所有」資料！"<b></b></string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"清除 USB 儲存裝置"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"清除 SD 卡"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"清除 USB 儲存裝置時，是否一併刪除所有儲存的檔案？這項動作無法復原！"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"清除 SD 卡時，是否刪除其中儲存的所有檔案？這項動作無法復原！"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"全部清除"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"畫出解鎖圖形"</string>
-    <string name="media_format_gesture_explanation" msgid="4239529439389660159">"您必須畫出解鎖圖形，以確認將 SD 卡格式化。"</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"您必須繪製解鎖圖形，以確認要清除 USB 儲存裝置。"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"您必須繪製解鎖圖形，以確認要清除 SD 卡。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"設定語音信箱、來電轉接、來電待接及本機號碼顯示"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 數據連線"</string>
@@ -670,7 +713,7 @@
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 數據連線"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"已連接 USB，選取即可進行數據連線"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"數據已連線"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"使用 USB 儲存空間時無法進行數據連線"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"使用 USB 儲存裝置時無法進行數據連線"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB 尚未連線"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB 數據連線發生錯誤"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"藍牙數據連線"</string>
@@ -680,10 +723,8 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"藍牙數據連線發生錯誤"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"最多只能連線至 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 個裝置"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的數據連線。"</string>
-    <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
-    <skip />
-    <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
-    <skip />
+    <string name="bluetooth_tether_settings_text" msgid="2273368767599539525">"藍牙數據連線設定"</string>
+    <string name="bluetooth_tether_settings_subtext" msgid="5970033999897946708">"選取要進行連線的藍牙裝置"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"行動網路"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"設定漫遊、網路、APN 選項"</string>
@@ -697,6 +738,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"使用輔助 GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"使用伺服器輔助 GPS (取消勾選即可降低網路使用量)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"使用伺服器輔助 GPS (取消勾選即可提升 GPS 效能)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3214740644957841179">"使用我的位置"</string>
+    <!-- no translation found for use_location_summary_disabled (1876901471649359806) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (984549156918597265) -->
+    <skip />
     <string name="about_settings" msgid="1743378368185371685">"關於手機"</string>
     <string name="about_settings_summary" msgid="3302263393543848667">"檢視法律資訊、手機狀態、軟體版本"</string>
     <string name="legal_information" msgid="5769301644270604095">"法律資訊"</string>
@@ -785,15 +831,21 @@
     <string name="unknown" msgid="1592123443519355854">"不明"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"按名稱排序"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"依大小排序"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"顯示執行中的服務"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"顯示快取處理程序"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"管理空間"</string>
     <string name="filter" msgid="2018011724373033887">"篩選"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"選取篩選選項"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"全部"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"已下載"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"執行中"</string>
-    <string name="filter_apps_onsdcard" msgid="1477351142334784771">"於 SD 卡"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 儲存裝置"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"於 SD 卡"</string>
     <string name="disabled" msgid="9206776641295849915">"已停用"</string>
     <string name="no_applications" msgid="5190227407135243904">"沒有應用程式。"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"內存空間"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 儲存裝置"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD 卡儲存裝置"</string>
     <string name="recompute_size" msgid="7722567982831691718">"重新計算大小..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"刪除"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"該應用程式的所有資料都將遭到永遠刪除，包含所有檔案、設定、帳戶、資料庫等等。"</string>
@@ -813,7 +865,8 @@
     <string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"移動"</string>
     <string name="move_app_to_internal" msgid="3895430471913858185">"移至手機"</string>
-    <string name="move_app_to_sdcard" msgid="1143379049903056407">"移至 SD 卡"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"移至 USB 儲存裝置"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"移至 SD 卡"</string>
     <string name="moving" msgid="6431016143218876491">"正在移動"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"剩餘的儲存空間不足。"</string>
     <string name="does_not_exist" msgid="837163572898468245">"應用程式不存在。"</string>
@@ -827,17 +880,18 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"偏好的安裝位置"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"變更新應用程式在安裝時的偏好位置。"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"儲存空間使用量"</string>
-    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
-    <skip />
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"查看應用程式所使用的儲存空間"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在運作的服務"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"查看並控制目前正在運作的服務"</string>
     <string name="service_restarting" msgid="2242747937372354306">"重新啟動中"</string>
+    <string name="cached" msgid="1059590879740175019">"快取背景處理程序"</string>
     <string name="no_running_services" msgid="2059536495597645347">"沒有正在執行中的服務。"</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"由應用程式啟動。"</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="4939976652114824214">"<xliff:g id="MEMORY">%1$s</xliff:g> 可供使用"</string>
-    <string name="service_foreground_processes" msgid="2474726487867913314">"<xliff:g id="MEMORY">%1$s</xliff:g> 正在使用中"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> 可用"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> 已使用"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 項處理程序和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 項服務"</string>
@@ -852,12 +906,17 @@
     <string name="service_manage" msgid="1876642087421959194">"設定"</string>
     <string name="service_stop_description" msgid="3261798282116866961">"這項服務是由其所屬應用程式啟動。停止服務可能會造成應用程式執行失敗。"</string>
     <string name="heavy_weight_stop_description" msgid="6855241582643136019">"無法安全停止這個應用程式。強制停止可能造成目前的作業喪失一部分。"</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"保留這項舊有的應用程式處理程序是為了加快處理速度，以免日後需要再次使用，通常不會無故停止這項處理程序。"</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>：目前在使用中。請輕觸 [設定] 管理此用戶端。"</string>
     <string name="main_running_process_description" msgid="929204645380391397">"使用中的主要處理程序。"</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"服務 <xliff:g id="COMP_NAME">%1$s</xliff:g> 正在使用中。"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"供應商 <xliff:g id="COMP_NAME">%1$s</xliff:g> 正在使用中。"</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"停止系統服務？"</string>
+    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"您確定要停止這項系統服務嗎？如果停止的話，您的某些手機功能可能會停止正常運作，待您重新開機後才會恢復正常。"</string>
     <string name="language_settings" msgid="502219872342167227">"語言與鍵盤"</string>
     <string name="language_keyboard_settings_title" msgid="3455826933385341107">"語言與鍵盤設定"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"語言設定"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"鍵盤設定"</string>
     <string name="phone_language" msgid="1165758957501090679">"選取語言"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"自動替換"</string>
@@ -897,9 +956,13 @@
     <string name="input_method" msgid="5434026103176856164">"輸入方式"</string>
     <string name="input_methods_settings_summary" msgid="7571173442946675205">"管理輸入法選項"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> 設定"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (6850705060511001699) -->
+    <skip />
+    <!-- no translation found for input_methods_and_subtype_enabler_title_format (2977431588856991351) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"螢幕鍵盤設定"</string>
-    <string name="builtin_keyboard_settings_title" msgid="8169889453770863227">"裝置小鍵盤"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6404687907454621637">"內建小鍵盤設定"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"內建鍵盤"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"內建實體鍵盤設定"</string>
     <string name="development_settings_title" msgid="6719732334835420989">"開發"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"設定應用程式開發選項"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 偵錯"</string>
@@ -931,16 +994,11 @@
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"此協助工具服務可能會收集您輸入的所有文字，包括個人資料及信用卡號碼，但並不會收集您輸入的密碼，而且它也可能會記錄您的使用者介面互動行為。該服務是由應用程式「<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>」所提供，要使用此協助工具服務嗎？"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"要停用協助工具嗎？"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"找不到與協助工具相關的應用程式"</string>
-    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
-    <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
-    <skip />
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"您尚未安裝與協助工具相關的應用程式。"\n\n"您可以從 Android Market 下載螢幕助讀器。"\n\n"按一下 [確定] 即可安裝螢幕助讀器。"</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"協助工具指令碼"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"下載協助工具指令碼"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"允許應用程式從 Google 下載協助工具指令碼"</string>
+    <string name="accessibility_script_injection_security_warning" msgid="9078893361741942109">"某些應用程式可以從 Google 將指令碼下載到您的手機，方便您存取特定內容。您確定要允許 Google 在您的手機上安裝協助工具指令碼？"</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"電源鍵"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"電源鍵可結束通話"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"通話時按下電源鍵結束通話，不會關閉螢幕"</string>
@@ -953,14 +1011,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"充電"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"螢幕已開"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"開啟 GPS"</string>
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"WIFI"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"清醒"</string>
     <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"手機訊號"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"裝置清醒時間"</string>
-    <string name="wifi_on_time" msgid="4630925382578609056">"WiFi 開啟時間"</string>
-    <string name="bluetooth_on_time" msgid="4478515071957280711">"WiFi 開啟時間"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"開啟 Wi-Fi 的時間"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"開啟 Wi-Fi 的時間"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="details_title" msgid="7564809986329021063">"電池使用狀況詳細資料"</string>
     <string name="details_subtitle" msgid="32593908269911734">"使用狀況詳細資訊"</string>
@@ -976,8 +1034,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持清醒"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
-    <skip />
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi 執行中"</string>
     <string name="usage_type_phone" msgid="9108247984998041853">"手機"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"已傳送資料"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"已接收資料"</string>
@@ -989,7 +1046,7 @@
     <string name="battery_action_app_details" msgid="3275013531871113681">"應用程式資訊"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"應用程式設定"</string>
     <string name="battery_action_display" msgid="5302763261448580102">"顯示設定"</string>
-    <string name="battery_action_wifi" msgid="5452076674659927993">"WiFi 設定"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi 設定"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"藍牙設定"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"語音通話耗電量"</string>
     <string name="battery_desc_standby" msgid="3009080001948091424">"手機閒置時的耗電量"</string>
@@ -1142,8 +1199,10 @@
     <string name="credentials_access_summary" msgid="319662078718574168">"允許應用程式存取安全認證及其他認證"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"輸入密碼"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"輸入認證儲存空間密碼。"</string>
-    <string name="credentials_install_certificates" msgid="177337517568022236">"從 SD 卡安裝"</string>
-    <string name="credentials_install_certificates_summary" msgid="7737001268684193093">"從 SD 卡安裝加密憑證"</string>
+    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"從 USB 儲存裝置安裝"</string>
+    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"從 SD 卡安裝"</string>
+    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"從 USB 儲存裝置安裝已加密的憑證"</string>
+    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"從 SD 卡安裝加密憑證"</string>
     <string name="credentials_set_password" msgid="9104473585811899989">"設定密碼"</string>
     <string name="credentials_set_password_summary" msgid="8287876917562085701">"設定或變更認證儲存空間密碼"</string>
     <string name="credentials_reset" msgid="9170150870552453457">"清除儲存空間"</string>
@@ -1180,11 +1239,11 @@
     <string name="backup_section_title" msgid="8856083167469467588">"備份與還原"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"個人資料"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"備份我的資料"</string>
-    <string name="backup_data_summary" msgid="5662190190240860035">"備份我的設定與其他應用程式的資料。"</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"將應用程式資料、Wi-Fi 密碼，以及其他設定備份到 Google 伺服器"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自動還原功能"</string>
-    <string name="auto_restore_summary" msgid="6867766474057290177">"當我重新安裝應用程式時，還原我已經備份的設定或其他資料。"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"當我重新安裝應用程式時，還原我已經備份的設定或其他資料"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"備份"</string>
-    <string name="backup_erase_dialog_message" msgid="2948090854996352245">"您確定要停止備份設定及應用程式資料，並清除 Google 伺服器上的所有相關資料嗎？"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"您確定要停止備份您的 Wi-Fi 密碼、書籤及他設定，以及應用程式資料，並清除 Google 伺服器上的所有相關資料嗎？"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"裝置管理設定"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"裝置管理員"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"撤銷"</string>
@@ -1206,35 +1265,24 @@
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"重新整理清單"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"略過"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"下一步"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"正在掃描網路..."</string>
     <string name="wifi_setup_status_select_network" msgid="4438531984292574854">"輕觸即可選取網路"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"連線至現有網路"</string>
-    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
-    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"輸入網路設定"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"連線至新的網路"</string>
     <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"連線中..."</string>
-    <string name="wifi_setup_status_connected" msgid="5350876766935146953">"已連線"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"前往下一個步驟"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"目前同步處理發生問題。稍後會回復正常。"</string>
-    <!-- no translation found for add_account_label (7811707265834013767) -->
-    <skip />
-    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
-    <skip />
-    <!-- no translation found for background_data (5779592891375473817) -->
-    <skip />
-    <!-- no translation found for background_data_summary (3630389249212620467) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
-    <skip />
-    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
-    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"新增帳戶"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"一般同步處理設定"</string>
+    <string name="background_data" msgid="5779592891375473817">"背景資料"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"應用程式隨時可以同步處理、傳送和接收資料"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"注意"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"停用背景資料可延長電池使用時間，並減少資料的傳輸量。但某些應用程式可能仍會使用背景資料連線。"</string>
     <string name="sync_automatically" msgid="7558810110682562376">"自動同步處理"</string>
-    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
-    <skip />
-    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4551148952179416813) -->
-    <skip />
-    <!-- no translation found for sync_disabled (8511659877596511991) -->
-    <skip />
-    <!-- no translation found for sync_error (5060969083117872149) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"應用程式會自動同步處理資料"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"管理帳戶"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"已開啟同步處理功能"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"已關閉同步處理功能"</string>
+    <string name="sync_error" msgid="5060969083117872149">"同步處理錯誤"</string>
 </resources>
diff --git a/tests/res/values-de/strings.xml b/tests/res/values-de/strings.xml
index 787a1d9..8b18d99 100644
--- a/tests/res/values-de/strings.xml
+++ b/tests/res/values-de/strings.xml
@@ -21,8 +21,8 @@
     <string name="stop_scan" msgid="527546916633745779">"Scan stoppen"</string>
     <string name="operator_hello" msgid="292208161864910159">"Hallo Operator!"</string>
     <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
-    <string name="operator_settings_summary" msgid="5916597343019392258">"Aufhänger des Operators, mit dem eine gewünschte Aktivität gestartet werden kann"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operator-Hook zum Starten einer gewünschten Aktivität"</string>
     <string name="manufacturer_hello" msgid="7525744633645544137">"Hallo Hersteller!"</string>
     <string name="manufacturer_settings_title" msgid="2503105049808838612">"Hersteller"</string>
-    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Aufhänger des Herstellers, mit dem eine gewünschte Aktivität gestartet werden kann"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Hersteller-Hook zum Starten einer gewünschten Aktivität"</string>
 </resources>