Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 89d696d..6c2ffbd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1114,6 +1114,7 @@
</activity>
<activity android:name=".SetupRedactionInterstitial"
+ android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme"/>
<activity android:name=".notification.RedactionInterstitial"/>
@@ -1168,12 +1169,14 @@
<activity android:name="SetupChooseLockPattern"
android:exported="false"
+ android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme" />
<activity android:name="ChooseLockPattern" android:exported="false"/>
<activity android:name="SetupChooseLockPassword"
android:exported="false"
+ android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme"
android:windowSoftInputMode="stateVisible|adjustResize" />
@@ -1181,6 +1184,7 @@
android:windowSoftInputMode="stateVisible|adjustResize"/>
<activity android:name=".SetupEncryptionInterstitial"
+ android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme"/>
<activity android:name=".EncryptionInterstitial"/>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 58f5ab1..ea6a44f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -307,7 +307,7 @@
<string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum a čas"</string>
<string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Nastavit datum a čas"</string>
<string name="date_and_time_settings_summary" msgid="7095318986757583584">"Umožňuje nastavit datum, čas, časové pásmo a formát"</string>
- <string name="date_time_auto" msgid="7076906458515908345">"Automatický datum a čas"</string>
+ <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é čas. pásmo"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b2e17d4..c550d17 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -863,7 +863,7 @@
<string name="sim_multi_sims_summary" msgid="7018740080801483990">"Wählen Sie Ihre bevorzugte SIM-Karte für Mobilfunkdaten aus."</string>
<string name="sim_change_data_title" msgid="294357201685244532">"Daten-SIM ändern?"</string>
<string name="sim_change_data_message" msgid="1313940695939674633">"<xliff:g id="NEW_SIM">%1$s</xliff:g> statt <xliff:g id="OLD_SIM">%2$s</xliff:g> für Mobilfunkdaten verwenden?"</string>
- <string name="sim_preferred_title" msgid="5567909634636045268">"Primäre SIM-Karte aktualisieren?"</string>
+ <string name="sim_preferred_title" msgid="5567909634636045268">"Bevorzugte SIM-Karte aktualisieren?"</string>
<string name="sim_preferred_message" msgid="301251431163650167">"\"<xliff:g id="NEW_SIM">%1$s</xliff:g>\" ist die einzige SIM-Karte in Ihrem Gerät. Möchten Sie diese SIM-Karte für Mobilfunkdaten, Anrufe und SMS verwenden?"</string>
<string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Falscher PIN-Code der SIM-Karte. Bitte wenden Sie sich an Ihren Mobilfunkanbieter, damit er Ihr Gerät entsperrt."</string>
<plurals name="wrong_pin_code">
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index c071ae5..837cab3 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -862,7 +862,7 @@
<string name="sim_multi_sims_summary" msgid="7018740080801483990">"Aukeratu datu mugikorretarako hobetsi nahi duzun SIM txartela."</string>
<string name="sim_change_data_title" msgid="294357201685244532">"Datuetarako SIMa aldatu nahi duzu?"</string>
<string name="sim_change_data_message" msgid="1313940695939674633">"Datu mugikorretarako <xliff:g id="NEW_SIM">%1$s</xliff:g> txartela erabili nahi duzu, <xliff:g id="OLD_SIM">%2$s</xliff:g> txartelaren ordez?"</string>
- <string name="sim_preferred_title" msgid="5567909634636045268">"SIM txartel hobetsia eguneratu nahi duzu?"</string>
+ <string name="sim_preferred_title" msgid="5567909634636045268">"SIM txartel hobetsia eguneratu?"</string>
<string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> da gailuan daukazun SIM bakarra. SIM hori erabili nahi duzu dei, testu-mezu zein datu-trafikorako?"</string>
<string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIMaren PIN kodea okerra da. Gailua desblokeatzeko, operadorearekin harremanetan jarri beharko duzu."</string>
<plurals name="wrong_pin_code">
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index af2cdfa4..caa1010 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -685,7 +685,7 @@
<string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Refuser"</string>
<string name="wifi_hotspot_title" msgid="7726205804813286950">"Se connecter au point d\'accès pour la connexion ?"</string>
<string name="wifi_hotspot_message" msgid="3673833421453455747">"\"<xliff:g id="APP_NAME">%1$s</xliff:g>\" requiert une connexion en ligne pour autoriser la connexion au réseau."</string>
- <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECTER"</string>
+ <string name="wifi_hotspot_connect" msgid="5065506390164939225">"SE CONNECTER"</string>
<string name="wifi_connect" msgid="1076622875777072845">"Se connecter"</string>
<string name="wifi_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
<string name="wifi_forget" msgid="8168174695608386644">"Retirer"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 870a2c7..efbc7f9 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -393,7 +393,7 @@
<string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Անվտանգություն չկա"</string>
<string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Դեմքով ապակողպում"</string>
<string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Ցածր անվտանգություն, փորձնական"</string>
- <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Կաղապար"</string>
+ <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Նախշ"</string>
<string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Միջին անվտանգություն"</string>
<string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
<string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Միջինից մինչև բարձր անվտանգություն"</string>
@@ -408,11 +408,11 @@
<string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
<string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Գաղտնաբառ"</string>
<string name="unlock_disable_lock_title" msgid="1427036227416979120">"Անջատել էկրանի կողպումը"</string>
- <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Հեռացնել ապակողպման կաղապարը"</string>
+ <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Հեռացնել ապակողպման նախշը"</string>
<string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Հեռացնել PIN-ի ապակողպումը"</string>
<string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Հեռացնել գաղտնաբառի ապակողպումը"</string>
<string name="unlock_disable_lock_unknown_summary" msgid="8688498722601653961">"Անջատել էկրանի կողպումը"</string>
- <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Փոխել ապակողպման կաղապարը"</string>
+ <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Փոխել ապակողպման նախշը"</string>
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Փոխել ապակողպման PIN-ը"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Փոխել ապակողպման գաղտնաբառը"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Գաղտնաբառը պետք է առնվազն %d նիշից բաղկացած լինի"</string>
@@ -1168,7 +1168,7 @@
<string name="lockpattern_settings_title" msgid="3207750489460466680">"Ապակողպող նախշը"</string>
<string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Պահանջել նախշ"</string>
<string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Օգտագործել նախշ՝ հեռախոսը պաշտպանելու համար"</string>
- <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Կաղապարը տեսանելի դարձնել"</string>
+ <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Նախշը տեսանելի դարձնել"</string>
<string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Թրթրռալ հպումից"</string>
<string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Հոսանքի կոճակը անկնթարթորեն կողպվում է"</string>
<string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Բացառությամբ, երբ ապակողպված է պահվում <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>-ի կողմից"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 62f3a6f..b66b33d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -862,7 +862,7 @@
<string name="sim_multi_sims_summary" msgid="7018740080801483990">"Scegli la SIM che preferisci per la rete dati."</string>
<string name="sim_change_data_title" msgid="294357201685244532">"Cambiare SIM di dati?"</string>
<string name="sim_change_data_message" msgid="1313940695939674633">"Utilizzare <xliff:g id="NEW_SIM">%1$s</xliff:g> anziché <xliff:g id="OLD_SIM">%2$s</xliff:g> per la rete dati?"</string>
- <string name="sim_preferred_title" msgid="5567909634636045268">"Aggiornare la scheda SIM preferita?"</string>
+ <string name="sim_preferred_title" msgid="5567909634636045268">"Aggiornare la SIM preferita?"</string>
<string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> è l\'unica SIM del tuo dispositivo. Vuoi utilizzarla per dati mobili, chiamate e SMS?"</string>
<string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Codice PIN della SIM errato. Devi contattare l\'operatore per sbloccare il dispositivo."</string>
<plurals name="wrong_pin_code">
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 79c5519..50f393d 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -862,8 +862,8 @@
<string name="sim_multi_sims_summary" msgid="7018740080801483990">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾಗೆ ನೀವು ಬಯಸುವ ಸಿಮ್ ಆಯ್ಕೆಮಾಡಿ."</string>
<string name="sim_change_data_title" msgid="294357201685244532">"ಡೇಟಾ ಸಿಮ್ ಬದಲಾಯಿಸುವುದೇ?"</string>
<string name="sim_change_data_message" msgid="1313940695939674633">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾಗಾಗಿ <xliff:g id="OLD_SIM">%2$s</xliff:g> ಬದಲಿಗೆ <xliff:g id="NEW_SIM">%1$s</xliff:g> ಅನ್ನು ಬಳಸುವುದೇ?"</string>
- <string name="sim_preferred_title" msgid="5567909634636045268">"ಪ್ರಾಶಸ್ತ್ಯದ SIM ಕಾರ್ಡ್ ನವೀಕರಿಸುವುದೇ?"</string>
- <string name="sim_preferred_message" msgid="301251431163650167">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM ಮಾತ್ರ ಇದೆ. ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ, ಕರೆಗಳು ಮತ್ತು SMS ಸಂದೇಶಗಳಿಗೆ ನೀವು ಈ SIM ಬಳಸಬೇಕೆಂದು ಬಯಸುತ್ತೀರಾ?"</string>
+ <string name="sim_preferred_title" msgid="5567909634636045268">"ಪ್ರಾಶಸ್ತ್ಯದ ಸಿಮ್ ಕಾರ್ಡ್ ನವೀಕರಿಸುವುದೇ?"</string>
+ <string name="sim_preferred_message" msgid="301251431163650167">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ <xliff:g id="NEW_SIM">%1$s</xliff:g> ಸಿಮ್ ಮಾತ್ರವಿದೆ. ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ, ಕರೆಗಳು ಮತ್ತು SMS ಸಂದೇಶಗಳಿಗೆ ನೀವು ಈ ಸಿಮ್ ಬಳಸಬೇಕೆಂದು ಬಯಸುತ್ತೀರಾ?"</string>
<string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ಸಿಮ್ ಪಿನ್ ಕೋಡ್ ತಪ್ಪಾಗಿದೆ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು ಈ ಕೂಡಲೇ ನಿಮ್ಮ ವಾಹಕವನ್ನು ಸಂಪರ್ಕಿಸಬೇಕು."</string>
<plurals name="wrong_pin_code">
<item quantity="one" msgid="4840607930166101114">"ಸಿಮ್ ಪಿನ್ ಕೋಡ್ ತಪ್ಪಾಗಿದೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್ಲಾಕ್ ಮಾಡುವ ಸಲುವಾಗಿ ನಿಮ್ಮ ವಾಹಕವನ್ನು ನೀವು ಸಂಪರ್ಕಿಸುವುದಕ್ಕೂ ಮೊದಲು ನಿಮ್ಮಲ್ಲಿ <xliff:g id="NUMBER">%d</xliff:g> ಪ್ರಯತ್ನಗಳು ಬಾಕಿ ಉಳಿದಿವೆ."</item>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 0883b1c..192bd61 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -862,7 +862,7 @@
<string name="sim_multi_sims_summary" msgid="7018740080801483990">"Pilih SIM yang anda mahu untuk data selular."</string>
<string name="sim_change_data_title" msgid="294357201685244532">"Ubah SIM data?"</string>
<string name="sim_change_data_message" msgid="1313940695939674633">"Gunakan <xliff:g id="NEW_SIM">%1$s</xliff:g> bukannya <xliff:g id="OLD_SIM">%2$s</xliff:g> untuk data selular?"</string>
- <string name="sim_preferred_title" msgid="5567909634636045268">"Kemas kini pilihan kad SIM?"</string>
+ <string name="sim_preferred_title" msgid="5567909634636045268">"Kemas kini kad SIM pilihan?"</string>
<string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> adalah satu-satunya SIM dalam peranti anda. Adakah anda ingin menggunakan SIM ini untuk data selular, panggilan dan mesej SMS?"</string>
<string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Kod PIN SIM tidak betul, jadi anda harus menghubungi pembawa anda untuk membuka kunci peranti."</string>
<plurals name="wrong_pin_code">
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index e02f5f8..76188ee 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -146,7 +146,7 @@
</string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Slab"</item>
- <item msgid="5615082285463430971">"Corect"</item>
+ <item msgid="5615082285463430971">"Acceptabil"</item>
<item msgid="3565079809875324621">"Bun"</item>
<item msgid="5702329417707689835">"Excelent"</item>
</string-array>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3c5af29..8315e22 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -112,8 +112,8 @@
<string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Eroare necunoscută"</string>
<string name="battery_info_health_cold" msgid="3835692786176707318">"Golită"</string>
<string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
- <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vizibil pt. dispoz. Bluetooth din aprop. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
- <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vizibil pt. toate disp. Bluetooth din apropiere"</string>
+ <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vizibil pt. toate dispoz. Bluetooth din apropiere (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+ <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vizibil pt. toate dispoz. Bluetooth din apropiere"</string>
<string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nu este vizibil pentru alte dispozitive Bluetooth"</string>
<string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vizibil numai pe dispozitivele asociate"</string>
<string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timp limită pentru vizibilitate"</string>
@@ -137,9 +137,9 @@
<string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Această acţiune va dezactiva:<br><b><xliff:g id="PROFILE_NAME">%1$s</xliff:g></b><br><br>de pe:<br><b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>"</string>
<string name="bluetooth_connected" msgid="6038755206916626419">"Conectat"</string>
<string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectat (fără telefon)"</string>
- <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectat (fără conţ. media)"</string>
+ <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectat (fără conţinut media)"</string>
<string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectat (fără acces la mesaje)"</string>
- <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectat (fără tel. sau conţ. media)"</string>
+ <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectat (fără telefon sau conţ. media)"</string>
<string name="bluetooth_disconnected" msgid="6557104142667339895">"Deconectat"</string>
<string name="bluetooth_disconnecting" msgid="8913264760027764974">"În curs de deconectare..."</string>
<string name="bluetooth_connecting" msgid="8555009514614320497">"Se conectează..."</string>
@@ -255,10 +255,10 @@
<string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Cardul SD este utilizat ca dispozitiv de stocare în masă."</string>
<string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Puteţi elimina stoc. USB în siguranţă"</string>
<string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Acum puteţi elimina cardul SD în siguranţă."</string>
- <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Stoc. USB elimin. în timpul funcţionării!"</string>
+ <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Stoc. USB eliminată în timpul funcţionării!"</string>
<string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Cardul SD a fost scos în timp ce era încă utilizat!"</string>
<string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Octeţi utilizaţi:"</string>
- <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Se scan. stoc. USB pt. media..."</string>
+ <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Se scanează stocare USB pt. media..."</string>
<string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Se scanează cardul SD pentru a se identifica fişiere media..."</string>
<string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Stoc.USB mont. numai în citire"</string>
<string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Cardul SD montat este numai în citire."</string>
@@ -383,8 +383,8 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeţi blocare ecran"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Aleg. blocare rezervă"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocarea ecranului"</string>
- <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schimbaţi bloc.ecran."</string>
- <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modificaţi sau dezactivaţi modelul, codul PIN sau siguranţa prin parolă"</string>
+ <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schimbaţi bloc. ecran."</string>
+ <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modificaţi sau dezactivaţi modelul, codul PIN sau parola"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Alegeţi o metodă pentru a bloca ecranul"</string>
<string name="unlock_backup_info_summary" msgid="108524727803788172">"Când funcţia Deblocare facială nu vă poate vedea, cum doriţi să deblocaţi?"</string>
<string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Fără"</string>
@@ -400,7 +400,7 @@
<string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parolă"</string>
<string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Securitate ridicată"</string>
<string name="unlock_disable_frp_warning_content" msgid="7070131836291098244">"Funcțiile de protecție a dispozitivului nu vor mai putea fi folosite."</string>
- <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dezactivată de admin./politică de criptare/date de conectare"</string>
+ <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dezactivată de admin./politică de criptare/acreditări stocate"</string>
<string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Fără"</string>
<string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Glisare"</string>
<string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Deblocare facială"</string>
@@ -526,7 +526,7 @@
<string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Distribuirea conexiunii la internet"</string>
<string name="bluetooth_profile_map" msgid="5465271250454324383">"Acces la mesaje"</string>
<string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la media audio."</string>
- <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la componenta audio handsfree."</string>
+ <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la componenta audio mâini libere."</string>
<string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la dispozitivul de intrare."</string>
<string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Va fi întrerupt accesul la internet prin <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
<string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la conexiunea acestui telefon la internet."</string>
@@ -543,8 +543,8 @@
<string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectat la hartă"</string>
<string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Neconectat la serverul de transfer de fişiere"</string>
<string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectat la dispozitivul de intrare"</string>
- <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectat la disp. pt. acces internet"</string>
- <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Se perm. disp. acces la internet local"</string>
+ <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectat la dispoz. pt. acces internet"</string>
+ <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Se permite dispoz. acces la internet local"</string>
<string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizaţi pentru profilul pentru conţinut media audio"</string>
<string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizaţi pentru componenta audio a telefonului"</string>
<string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizaţi pentru transferul de fişiere"</string>
@@ -924,11 +924,11 @@
<string name="memory_music_usage" msgid="1363785144783011606">"Audio (muzică, tonuri de sonerie, podcasturi etc.)"</string>
<string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
<string name="memory_media_cache_usage" msgid="6704293333141177910">"Datele memorate în cache"</string>
- <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demontaţi stoc. distrib."</string>
+ <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demontaţi stocare distribuită"</string>
<string name="sd_eject" product="default" msgid="6915293408836853020">"Demontaţi cardul SD"</string>
<string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demontaţi stocarea USB internă"</string>
<string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Demontaţi cardul SD, pentru a-l putea elimina în siguranţă"</string>
- <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Inser. stoc. USB pt. montare"</string>
+ <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Inserați stocare USB pt. montare"</string>
<string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Introduceţi un card SD pentru montare"</string>
<string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Montaţi stocarea USB"</string>
<string name="sd_mount" product="default" msgid="5940523765187704135">"Montaţi cardul SD"</string>
@@ -1063,13 +1063,13 @@
<string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering prin Bluetooth"</string>
<string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Se permite acces la conexiunea internet a tabletei"</string>
<string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Se permite acces la conex. internet a telefonului"</string>
- <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Se permite acces la conex. internet a tabletei pt. 1 disp."</string>
- <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Se permite acces la conex. internet a telef. pt. 1 disp."</string>
- <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Se permite acces la conex.internet a tabletei pt. <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
- <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Se permite acces la conex. internet a telef. pt. <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
+ <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Se permite acces la conex. internet a tabletei pt. 1 dispoz."</string>
+ <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Se permite acces la conex. internet a telef. pt. 1 dispoz."</string>
+ <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Se permite acces la conex. internet a tabletei pt. <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispoz."</string>
+ <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Se permite acces la conexiunea internet a telef. pt. <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispoz."</string>
<string name="bluetooth_tethering_off_subtext_config" msgid="1790242032929221788">"Se utiliz. conex. la internet a dispozitivului <xliff:g id="DEVICE_NAME">%1$d</xliff:g>"</string>
<string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Nu se permite acces la conex. internet a tabletei"</string>
- <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Nu se perm. acces la conex. internet a telefonului"</string>
+ <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Nu se permite acces la conex. internet a telefonului"</string>
<string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Nu este conectat ca modem"</string>
<string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"Este imposibil tethering cu peste <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispozitive."</string>
<string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat."</string>
@@ -1115,7 +1115,7 @@
<string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizaţi serverul pentru a asista funcţia GPS (debifaţi pentru a reduce utilizarea reţelei)"</string>
<string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizaţi serverul pentru a asista funcţia GPS (debifaţi pentru a îmbunătăţi performanţa GPS)"</string>
<string name="use_location_title" msgid="5206937465504979977">"Locaţie şi căutare Google"</string>
- <string name="use_location_summary" msgid="3978805802386162520">"Permiteţi Google să utilizeze locaţia dvs. pt. îmbunăt. rezultatelor căutării şi serviciilor"</string>
+ <string name="use_location_summary" msgid="3978805802386162520">"Permiteţi Google să utilizeze locaţia dvs. pt. îmbunătățirea rezultatelor căutării şi a serviciilor"</string>
<string name="location_access_title" msgid="7064108942964081243">"Acces la locaţia dvs."</string>
<string name="location_access_summary" msgid="69031404093194341">"Acordaţi aplicaţiilor care v-au solicitat, permisiunea să utilizeze informaţiile dvs. de localizare"</string>
<string name="location_sources_heading" msgid="1278732419851088319">"Surse de locaţii"</string>
@@ -1145,7 +1145,7 @@
<string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmaţi codul PIN"</string>
<string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Parolele nu corespund"</string>
<string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Codurile PIN nu corespund"</string>
- <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Select. metoda de deblocare"</string>
+ <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selectați metoda de deblocare"</string>
<string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parola a fost setată"</string>
<string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Codul PIN a fost setat"</string>
<string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Modelul a fost setat"</string>
@@ -1340,7 +1340,7 @@
<string name="main_running_process_description" msgid="1130702347066340890">"Procesul principal în uz."</string>
<string name="process_service_in_use_description" msgid="8993335064403217080">"Serviciul <xliff:g id="COMP_NAME">%1$s</xliff:g> se află în utilizare."</string>
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Furnizorul <xliff:g id="COMP_NAME">%1$s</xliff:g> se află în utilizare."</string>
- <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Opriţi serviciul sistemului?"</string>
+ <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Opriţi serviciul de sistem?"</string>
<string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale tabletei să nu mai funcţioneze corect decât după ce o veţi închide şi redeschide."</string>
<string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale telefonului să nu mai funcţioneze corect decât după ce îl veţi închide şi redeschide."</string>
<string name="language_settings" msgid="5292716747264442359">"Limbă și introducere de text"</string>
@@ -1785,7 +1785,7 @@
<string name="pico_not_installed" msgid="6266845418419994311">"Neinstalată"</string>
<string name="pico_voice_summary_female" msgid="8047327176247727492">"Feminină"</string>
<string name="pico_voice_summary_male" msgid="8331266854058577610">"Masculină"</string>
- <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motorul de sint. a vorb. instalat"</string>
+ <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motor sintetiz. vorbire instalat"</string>
<string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Activ. mot. nou înaintea util."</string>
<string name="tts_engine_settings_button" msgid="1030512042040722285">"Lansaţi setările motorului"</string>
<string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferat"</string>
@@ -1829,10 +1829,10 @@
<string name="credentials_reset_hint" msgid="6297256880896133631">"Eliminaţi întregul conţinut?"</string>
<string name="credentials_password_too_short" msgid="7502749986405522663">"Parola trebuie să conţină minimum 8 caractere."</string>
<string name="credentials_wrong_password" msgid="2541932597104054807">"Parolă incorectă."</string>
- <string name="credentials_reset_warning" msgid="5320653011511797600">"Parolă incorectă. Mai aveţi dreptul la o singură încercare înainte ca stocarea acreditărilor să fie ştearsă."</string>
- <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Parolă incorectă. Mai aveţi dreptul la <xliff:g id="NUMBER">%1$d</xliff:g> încercări înainte ca stocarea acreditărilor să fie ştearsă."</string>
- <string name="credentials_erased" msgid="2907836028586342969">"Stoc. acredit. este ştearsă."</string>
- <string name="credentials_not_erased" msgid="93461830775441220">"Nu s-a şters sp. stoc. cert."</string>
+ <string name="credentials_reset_warning" msgid="5320653011511797600">"Parolă incorectă. Mai aveţi dreptul la o singură încercare înainte ca acreditările stocate să fie şterse."</string>
+ <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Parolă incorectă. Mai aveţi dreptul la <xliff:g id="NUMBER">%1$d</xliff:g> încercări înainte ca acreditările stocate să fie şterse."</string>
+ <string name="credentials_erased" msgid="2907836028586342969">"Acreditările stocate sunt şterse."</string>
+ <string name="credentials_not_erased" msgid="93461830775441220">"Nu s-au șters acredit. stocate"</string>
<string name="credentials_enabled" msgid="7588607413349978930">"Stocarea acreditărilor este activată."</string>
<string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebuie să setaţi un cod PIN sau o parolă pentru blocarea ecranului înainte de a putea utiliza spaţiul de stocare a certificatelor."</string>
<string name="usage_access_title" msgid="332333405495457839">"Apl. cu acces la date de util."</string>
@@ -1853,7 +1853,7 @@
<string name="auto_restore_summary" msgid="4235615056371993807">"La reinstalarea unei aplicaţii, restabiliţi setările şi datele pentru care aţi creat o copie de rezervă"</string>
<string name="backup_inactive_title" msgid="5355557151569037197">"Serviciul de backup este inactiv."</string>
<string name="backup_inactive_summary" msgid="7630412094703573180">"Acest serviciu este configurat de politica privind dispozitivele."</string>
- <string name="local_backup_password_title" msgid="3860471654439418822">"Parolă cop. rez. desktop"</string>
+ <string name="local_backup_password_title" msgid="3860471654439418822">"Parolă copie rez. desktop"</string>
<string name="local_backup_password_summary_none" msgid="393503434408227110">"În prezent, copiile de rezervă complete pe desktop nu sunt protejate"</string>
<string name="local_backup_password_summary_change" msgid="2731163425081172638">"Atingeţi pentru a modifica sau pentru a elimina parola pentru copiile de rezervă complete pe desktop"</string>
<string name="local_backup_password_toast_success" msgid="582016086228434290">"A fost setată o parolă de rezervă nouă"</string>
@@ -1901,7 +1901,7 @@
<string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Se scanează reţelele..."</string>
<string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Atingeţi o reţea pentru a vă conecta la aceasta"</string>
<string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conectaţi-vă la reţeaua existentă"</string>
- <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectaţi-vă la o reţea nesecuriz."</string>
+ <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectaţi-vă la reţea nesecurizată"</string>
<string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Introduceţi configuraţia reţelei"</string>
<string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Conectaţi-vă la o reţea nouă"</string>
<string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Se conectează..."</string>
@@ -1925,9 +1925,9 @@
<string name="background_data_summary" msgid="8328521479872763452">"Aplicaţiile pot oricând sincroniza, trimite şi primi date"</string>
<string name="background_data_dialog_title" msgid="6059217698124786537">"Dez. dat. de fundal?"</string>
<string name="background_data_dialog_message" msgid="6981661606680941633">"Dezactivarea datelor de fundal creşte durata de viaţă a bateriei şi reduce nivelul de utilizare a datelor. Anumite aplicaţii pot utiliza în continuare conexiunea de date de fundal."</string>
- <string name="sync_automatically" msgid="1682730255435062059">"Sinc. autom. a datelor aplicaţiei"</string>
- <string name="sync_enabled" msgid="4551148952179416813">"Sinc. este ACTIVATĂ"</string>
- <string name="sync_disabled" msgid="8511659877596511991">"Sinc. este DEZACTIV."</string>
+ <string name="sync_automatically" msgid="1682730255435062059">"Sinc. automată a datelor aplicaţiei"</string>
+ <string name="sync_enabled" msgid="4551148952179416813">"Sincronizarea e ACTIVATĂ"</string>
+ <string name="sync_disabled" msgid="8511659877596511991">"Sincroniz. e DEZACTIVATĂ"</string>
<string name="sync_error" msgid="5060969083117872149">"Eroare de sincronizare"</string>
<string name="last_synced" msgid="4242919465367022234">"Ultima sincronizare <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
<string name="sync_in_progress" msgid="5151314196536070569">"Se sincronizează acum…"</string>
@@ -1973,7 +1973,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Selectaţi-le pe toate"</string>
<string name="hdcp_checking_title" msgid="8605478913544273282">"Verificare HDCP"</string>
- <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Setaţi comp. verif. HDCP"</string>
+ <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Configurați verific. HDCP"</string>
<string name="debug_debugging_category" msgid="6781250159513471316">"Depanare"</string>
<string name="debug_app" msgid="8349591734751384446">"Selectaţi aplicaţia de depanare"</string>
<string name="debug_app_not_set" msgid="718752499586403499">"Nu aţi setat o aplicaţie de depanare"</string>
@@ -1988,9 +1988,9 @@
<string name="media_category" msgid="4388305075496848353">"Media"</string>
<string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorizare"</string>
<string name="strict_mode" msgid="1938795874357830695">"Modul Strict activat"</string>
- <string name="strict_mode_summary" msgid="142834318897332338">"Ilum. intermit. la operaţii lungi pe firul princ."</string>
+ <string name="strict_mode_summary" msgid="142834318897332338">"Iluminare intermitentă la operații lungi pe firul principal"</string>
<string name="pointer_location" msgid="6084434787496938001">"Locaţia indicatorului"</string>
- <string name="pointer_location_summary" msgid="840819275172753713">"Suprap. pe ecran indic. date curente pt. atingeri"</string>
+ <string name="pointer_location_summary" msgid="840819275172753713">"Suprapunere care indică date curente pt. atingeri"</string>
<string name="show_touches" msgid="1356420386500834339">"Afişaţi atingerile"</string>
<string name="show_touches_summary" msgid="6684407913145150041">"Afişaţi feedback vizual pentru atingeri"</string>
<string name="show_screen_updates" msgid="5470814345876056420">"Afiş. actualiz. suprafeţe"</string>
@@ -2012,22 +2012,22 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Afişaţi limitele clipului, marginile etc."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Direcție aspect dr. - st."</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Direcție obligatorie aspect ecran dreapta - stânga"</string>
- <string name="show_cpu_usage" msgid="2389212910758076024">"Afişaţi utiliz. procesor."</string>
- <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suprap. pe ecran indic. util. curentă a procesor."</string>
+ <string name="show_cpu_usage" msgid="2389212910758076024">"Afişaţi utiliz. procesor"</string>
+ <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suprapunere care indică utilizare curentă procesor"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Forţaţi redarea cu GPU"</string>
<string name="force_hw_ui_summary" msgid="5535991166074861515">"Forţaţi utilizarea GPU pentru desen în 2D"</string>
<string name="force_msaa" msgid="7920323238677284387">"Forţaţi MSAA 4x"</string>
<string name="force_msaa_summary" msgid="9123553203895817537">"Activaţi MSAA 4x în aplicaţiile OpenGL ES 2.0"</string>
<string name="show_non_rect_clip" msgid="505954950474595172">"Remediați decupări nerectangulare"</string>
<string name="track_frame_time" msgid="6146354853663863443">"Profil redare cu GPU"</string>
- <string name="window_animation_scale_title" msgid="6162587588166114700">"Scara anim. în fereastră"</string>
- <string name="transition_animation_scale_title" msgid="387527540523595875">"Scară pt. anim. cu tranz."</string>
+ <string name="window_animation_scale_title" msgid="6162587588166114700">"Scară animație fereastră"</string>
+ <string name="transition_animation_scale_title" msgid="387527540523595875">"Scară tranziție animații"</string>
<string name="animator_duration_scale_title" msgid="3406722410819934083">"Scară durată Animator"</string>
<string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulaţi afişaje secundare"</string>
<string name="debug_applications_category" msgid="4206913653849771549">"Aplicaţii"</string>
<string name="immediately_destroy_activities" msgid="8366775083630234121">"Nu păstraţi activităţile"</string>
<string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Elimină activitățile imediat ce utilizatorul le închide"</string>
- <string name="app_process_limit_title" msgid="4280600650253107163">"Limita proces. de fundal"</string>
+ <string name="app_process_limit_title" msgid="4280600650253107163">"Limită procese fundal"</string>
<string name="show_all_anrs" msgid="28462979638729082">"Afişaţi toate elem. ANR"</string>
<string name="show_all_anrs_summary" msgid="641908614413544127">"Afiş. dialog. Aplic. nu răsp. pt. aplic. de fundal"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizarea datelor"</string>
@@ -2037,7 +2037,7 @@
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMAȚII DESPRE APLICAȚIE"</string>
<string name="data_usage_cellular_data" msgid="4859424346276043677">"Date mobile"</string>
<string name="data_usage_data_limit" msgid="1193930999713192703">"Setați limita de date"</string>
- <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclul de util. a datelor"</string>
+ <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclu utilizare date"</string>
<string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Utilizarea aplicațiilor"</string>
<string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming de date"</string>
<string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restricţionaţi datele de fundal"</string>
@@ -2045,7 +2045,7 @@
<string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Utilizarea 4G afişată separat"</string>
<string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Afișați Wi-Fi"</string>
<string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"Ascundeți Wi‑Fi"</string>
- <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Afişaţi utiliz. conex. Ethernet"</string>
+ <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Afişaţi utilizarea Ethernet"</string>
<string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"Ascunde utilizare Ethernet"</string>
<string name="data_usage_menu_metered" msgid="6235119991372755026">"Restricții de rețea"</string>
<string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizați automat datele"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a2627d4..2e3340b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -854,8 +854,8 @@
<string name="sim_multi_sims_summary" msgid="7018740080801483990">"Chagua SIM unayopendelea kwa data ya simu za mkononi."</string>
<string name="sim_change_data_title" msgid="294357201685244532">"Je, ungependa kubadilisha SIM ya data?"</string>
<string name="sim_change_data_message" msgid="1313940695939674633">"Je, ungependa kutumia <xliff:g id="NEW_SIM">%1$s</xliff:g> badala ya <xliff:g id="OLD_SIM">%2$s</xliff:g> kwa data ya vifaa vya mkononi?"</string>
- <string name="sim_preferred_title" msgid="5567909634636045268">"Badilisha SIM kadi pendwa?"</string>
- <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> ni SIM pekee katika kifaa chako. Je, unataka kutumia SIM hii kwa data ya simu za mkononi, kupiga simu, na ujumbe wa SMS?"</string>
+ <string name="sim_preferred_title" msgid="5567909634636045268">"Unataka kubadili SIM kadi?"</string>
+ <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> ndiyo SIM ya pekee katika kifaa chako. Unataka kutumia SIM hii kupata huduma ya data, kupiga simu, na ujumbe wa SMS?"</string>
<string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Msimbo wa PIN ya SIM usio sahihi sasa lazima uwasiliane na mtoa huduma wako ili ufungue kifaa chako."</string>
<plurals name="wrong_pin_code">
<item quantity="one" msgid="4840607930166101114">"Msimbo wa PIN ya SIM usio sahihi, umesalia na majaribio <xliff:g id="NUMBER">%d</xliff:g> kabla ulazimike kuwasiliana na mtoa huduma wako ili ufungue kifaa chako."</item>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index f178142..f3f4b01 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -862,7 +862,7 @@
<string name="sim_multi_sims_summary" msgid="7018740080801483990">"செல்லுலார் தரவிற்கான சிம் ஐத் தேர்வுசெய்யவும்."</string>
<string name="sim_change_data_title" msgid="294357201685244532">"தரவு சிம்மினை மாற்றவா?"</string>
<string name="sim_change_data_message" msgid="1313940695939674633">"செல்லுலார் தரவிற்கு, <xliff:g id="OLD_SIM">%2$s</xliff:g>க்குப் பதிலாக <xliff:g id="NEW_SIM">%1$s</xliff:g>ஐப் பயன்படுத்தவா?"</string>
- <string name="sim_preferred_title" msgid="5567909634636045268">"விருப்ப சிம் கார்டைப் மாற்றவா?"</string>
+ <string name="sim_preferred_title" msgid="5567909634636045268">"விருப்ப சிம் கார்டை மாற்றவா?"</string>
<string name="sim_preferred_message" msgid="301251431163650167">"உங்கள் சாதனத்தில் <xliff:g id="NEW_SIM">%1$s</xliff:g> சிம் மட்டுமே உள்ளது. செல்லுலார் தரவு, அழைப்புகள் மற்றும் SMS செய்திகளுக்கு இந்தச் சிம்மைப் பயன்படுத்தவா?"</string>
<string name="wrong_pin_code_pukked" msgid="4003655226832658066">"சிம் பின் குறியீடு தவறானது, உங்கள் சாதனத்தைத் திறக்க, உங்கள் மொபைல் நிறுவனத்தைத் தொடர்புகொள்ள வேண்டும்."</string>
<plurals name="wrong_pin_code">
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index aaada67..eafcec0 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -863,7 +863,7 @@
<string name="sim_change_data_title" msgid="294357201685244532">"變更行動數據連線 SIM 卡？"</string>
<string name="sim_change_data_message" msgid="1313940695939674633">"要將行動數據連線 SIM 卡從「<xliff:g id="OLD_SIM">%2$s</xliff:g>」改為「<xliff:g id="NEW_SIM">%1$s</xliff:g>」嗎？"</string>
<string name="sim_preferred_title" msgid="5567909634636045268">"更新慣用的 SIM 卡？"</string>
- <string name="sim_preferred_message" msgid="301251431163650167">"「<xliff:g id="NEW_SIM">%1$s</xliff:g>」是裝置中唯一的 SIM 卡。您要使用這張 SIM 卡來連線至行動網路、通話及傳送簡訊嗎？"</string>
+ <string name="sim_preferred_message" msgid="301251431163650167">"「<xliff:g id="NEW_SIM">%1$s</xliff:g>」是裝置中唯一的 SIM 卡。您要使用這張 SIM 卡連線到行動網路、通話及傳送簡訊嗎？"</string>
<string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM 卡的 PIN 碼輸入錯誤，您現在必須請行動通訊業者為裝置解鎖。"</string>
<plurals name="wrong_pin_code">
<item quantity="one" msgid="4840607930166101114">"SIM 卡的 PIN 碼輸入錯誤，您還可以再試 <xliff:g id="NUMBER">%d</xliff:g> 次。如果仍然失敗，就必須請行動通訊業者為裝置解鎖。"</item>
@@ -2340,7 +2340,7 @@
<string name="sim_notification_title" msgid="6272913297433198340">"SIM 卡已變更。"</string>
<string name="sim_notification_summary" msgid="5024470200658902406">"輕觸即可設定"</string>
<string name="sim_pref_divider" msgid="6778907671867621874">"適用於以下用途的偏好 SIM 卡"</string>
- <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"每次皆詢問"</string>
+ <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"每次都詢問"</string>
<string name="sim_selection_required_pref" msgid="3446721423206414652">"請選取偏好設定"</string>
<string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
<string name="search_results_title" msgid="1796252422574886932">"設定"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 74062ae..58b8b8e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5519,6 +5519,8 @@
<string name="sim_calls_always_use">Always use this for calls</string>
<!-- Message for selecting sim for data in settings. [CHAR LIMIT=40] -->
<string name="select_sim_for_data">Select a SIM for data</string>
+ <!-- Message for switching data SIM; switching takes a while -->
+ <string name="data_switch_started">Switching data SIM, this may take up to a minute...</string>
<!-- Message for selecting sim for call in settings. [CHAR LIMIT=40] -->
<string name="select_sim_for_calls">Call with</string>
<!-- Title for selecting a SIM card. [CHAR LIMIT=40] -->
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 929053f..cb923c8 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -25,7 +25,7 @@
android:persistent="false" />
<!-- Feature description text -->
- <Preference
+ <com.android.settings.fuelgauge.WallOfTextPreference
android:key="description"
android:summary="@*android:string/battery_saver_description"
android:persistent="false"
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index e454ed1..38f908e 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -578,12 +578,12 @@
utils.setVisiblePatternEnabled(true);
}
- getActivity().setResult(RESULT_FINISHED);
- getActivity().finish();
- mDone = true;
if (!wasSecureBefore) {
startActivity(getRedactionInterstitialIntent(getActivity()));
}
+ getActivity().setResult(RESULT_FINISHED);
+ getActivity().finish();
+ mDone = true;
}
}
}
diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java
index 72d3158..38fd335 100644
--- a/src/com/android/settings/deviceinfo/ImeiInformation.java
+++ b/src/com/android/settings/deviceinfo/ImeiInformation.java
@@ -63,8 +63,8 @@
}
}
- private void setPreferenceValue(int slotId) {
- final Phone phone = getPhoneFromSlotId(slotId);
+ private void setPreferenceValue(int phoneId) {
+ final Phone phone = PhoneFactory.getPhone(phoneId);
if (phone != null) {
if (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
@@ -92,7 +92,7 @@
setSummaryText(KEY_IMEI, phone.getDeviceId());
setSummaryText(KEY_IMEI_SV,
((TelephonyManager) getSystemService(TELEPHONY_SERVICE))
- .getDeviceSoftwareVersion(/*slotId*/));
+ .getDeviceSoftwareVersion(phoneId));
// device is not CDMA, do not display CDMA features
// check Null in case no specified preference in overlay xml
removePreferenceFromScreen(KEY_PRL_VERSION);
@@ -103,24 +103,6 @@
}
}
- private Phone getPhoneFromSlotId(int slotIdx) {
- final SubscriptionInfo subInfo =
- mSubscriptionManager.getActiveSubscriptionInfoForSimSlotIndex(slotIdx);
-
- if (subInfo == null) {
- return null;
- }
-
- final Phone[] phones = PhoneFactory.getPhones();
- for (int i = 0; i < phones.length; i++) {
- if (phones[i].getSubId() == subInfo.getSubscriptionId()) {
- return phones[i];
- }
- }
-
- return null;
- }
-
// Modify the preference key with prefix "_", so new added information preference can be set
// related phone information.
private void setNewKey(int slotId) {
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 6c52412..1300419 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -343,7 +343,7 @@
}
}
- String rawNumber = mTelephonyManager.getLine1Number(); // may be null or empty
+ String rawNumber = mTelephonyManager.getLine1NumberForSubscriber(mSir.getSubscriptionId());
String formattedNumber = null;
if (!TextUtils.isEmpty(rawNumber)) {
formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
diff --git a/src/com/android/settings/fuelgauge/WallOfTextPreference.java b/src/com/android/settings/fuelgauge/WallOfTextPreference.java
new file mode 100644
index 0000000..5577206
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/WallOfTextPreference.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+public class WallOfTextPreference extends Preference {
+
+ public WallOfTextPreference(Context context) {
+ super(context);
+ }
+
+ public WallOfTextPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public WallOfTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ public WallOfTextPreference(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ }
+
+ @Override
+ protected void onBindView(View view) {
+ super.onBindView(view);
+ final TextView summary = (TextView) view.findViewById(android.R.id.summary);
+ summary.setMaxLines(20);
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 9bd9ab5..4201868 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -39,6 +39,7 @@
import android.widget.ImageView;
import android.widget.ListAdapter;
import android.widget.TextView;
+import android.widget.Toast;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -115,6 +116,7 @@
private static void setDefaultDataSubId(final Context context, final int subId) {
final SubscriptionManager subscriptionManager = SubscriptionManager.from(context);
subscriptionManager.setDefaultDataSubId(subId);
+ Toast.makeText(context, R.string.data_switch_started, Toast.LENGTH_LONG).show();
}
private static void setDefaultSmsSubId(final Context context, final int subId) {
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 450ffff..92a10d6 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -18,26 +18,21 @@
import android.app.AlertDialog;
import android.content.Context;
-import android.content.ContentUris;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources;
-import android.database.Cursor;
import android.graphics.Paint;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ShapeDrawable;
import android.graphics.drawable.shapes.OvalShape;
-import android.net.Uri;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceScreen;
import android.provider.SearchIndexableResource;
-import android.provider.Telephony;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.PhoneNumberUtils;
-import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.text.TextUtils;
@@ -49,12 +44,8 @@
import android.widget.ImageView;
import android.widget.Spinner;
import android.widget.TextView;
-import android.app.Dialog;
import android.view.ViewGroup;
import android.widget.AdapterView;
-import android.widget.ListAdapter;
-
-import com.android.internal.telephony.PhoneFactory;
import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.Utils;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -62,9 +53,6 @@
import com.android.settings.R;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
public class SimSettings extends RestrictedSettingsFragment implements Indexable {
@@ -122,6 +110,7 @@
private SubscriptionManager mSubscriptionManager;
private Utils mUtils;
+
public SimSettings() {
super(DISALLOW_CONFIG_SIM);
}
@@ -283,152 +272,6 @@
return true;
}
- @Override
- public Dialog onCreateDialog(final int id) {
- final ArrayList<String> list = new ArrayList<String>();
- final int selectableSubInfoLength = mSelectableSubInfos.size();
-
- final DialogInterface.OnClickListener selectionListener =
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int value) {
-
- final SubscriptionInfo sir;
-
- if (id == DATA_PICK) {
- sir = mSelectableSubInfos.get(value);
- mSubscriptionManager.setDefaultDataSubId(sir.getSubscriptionId());
- } else if (id == CALLS_PICK) {
- final TelecomManager telecomManager =
- TelecomManager.from(getActivity());
- final List<PhoneAccountHandle> phoneAccountsList =
- telecomManager.getCallCapablePhoneAccounts();
- telecomManager.setUserSelectedOutgoingPhoneAccount(
- value < 1 ? null : phoneAccountsList.get(value - 1));
- } else if (id == SMS_PICK) {
- sir = mSelectableSubInfos.get(value);
- mSubscriptionManager.setDefaultSmsSubId(sir.getSubscriptionId());
- }
-
- updateActivitesCategory();
- }
- };
-
- if (id == CALLS_PICK) {
- final TelecomManager telecomManager = TelecomManager.from(getActivity());
- final Iterator<PhoneAccountHandle> phoneAccounts =
- telecomManager.getCallCapablePhoneAccounts().listIterator();
-
- list.add(getResources().getString(R.string.sim_calls_ask_first_prefs_title));
- while (phoneAccounts.hasNext()) {
- final PhoneAccount phoneAccount =
- telecomManager.getPhoneAccount(phoneAccounts.next());
- list.add((String)phoneAccount.getLabel());
- }
- } else {
- for (int i = 0; i < selectableSubInfoLength; ++i) {
- final SubscriptionInfo sir = mSelectableSubInfos.get(i);
- CharSequence displayName = sir.getDisplayName();
- if (displayName == null) {
- displayName = "";
- }
- list.add(displayName.toString());
- }
- }
-
- String[] arr = list.toArray(new String[0]);
-
- AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-
- ListAdapter adapter = new SelectAccountListAdapter(
- builder.getContext(),
- R.layout.select_account_list_item,
- arr, id);
-
- if (id == DATA_PICK) {
- builder.setTitle(R.string.select_sim_for_data);
- } else if (id == CALLS_PICK) {
- builder.setTitle(R.string.select_sim_for_calls);
- } else if (id == SMS_PICK) {
- builder.setTitle(R.string.sim_card_select_title);
- }
-
- return builder.setAdapter(adapter, selectionListener)
- .create();
- }
-
- private class SelectAccountListAdapter extends ArrayAdapter<String> {
- private Context mContext;
- private int mResId;
- private int mDialogId;
- private final float OPACITY = 0.54f;
-
- public SelectAccountListAdapter(
- Context context, int resource, String[] arr, int dialogId) {
- super(context, resource, arr);
- mContext = context;
- mResId = resource;
- mDialogId = dialogId;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- LayoutInflater inflater = (LayoutInflater)
- mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- View rowView;
- final ViewHolder holder;
- SubscriptionInfo sir;
-
- if (convertView == null) {
- // Cache views for faster scrolling
- rowView = inflater.inflate(mResId, null);
- holder = new ViewHolder();
- holder.title = (TextView) rowView.findViewById(R.id.title);
- holder.summary = (TextView) rowView.findViewById(R.id.summary);
- holder.icon = (ImageView) rowView.findViewById(R.id.icon);
- rowView.setTag(holder);
- } else {
- rowView = convertView;
- holder = (ViewHolder) rowView.getTag();
- }
-
- if (mDialogId == CALLS_PICK) {
- holder.title.setText(getItem(position));
- if (position == 0) {
- holder.icon.setImageDrawable(getResources()
- .getDrawable(R.drawable.ic_live_help));
- holder.icon.setAlpha(OPACITY);
- holder.summary.setText("");
- } else {
- final TelecomManager telecomManager = TelecomManager.from(getActivity());
- final Iterator<PhoneAccountHandle> phoneAccounts =
- telecomManager.getCallCapablePhoneAccounts().listIterator();
- while (phoneAccounts.hasNext()) {
- final PhoneAccount phoneAccount =
- telecomManager.getPhoneAccount(phoneAccounts.next());
- if (getItem(position).equals((String) phoneAccount.getLabel())) {
- holder.icon.setImageBitmap(phoneAccount.getIconBitmap());
- holder.summary
- .setText(phoneAccount.getAddress().getSchemeSpecificPart());
- }
- }
- }
- } else {
- sir = mSelectableSubInfos.get(position);
- holder.title.setText(sir.getDisplayName());
- holder.summary.setText(getPhoneNumber(sir));
- holder.icon.setImageBitmap(sir.createIconBitmap(mContext));
- }
- return rowView;
- }
-
- private class ViewHolder {
- TextView title;
- TextView summary;
- ImageView icon;
- }
- }
-
private class SimPreference extends Preference{
private SubscriptionInfo mSubInfoRecord;
private int mSlotId;