diff options
56 files changed, 348 insertions, 203 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fa13e90..e2138e0 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -685,7 +685,6 @@ android:excludeFromRecents="true"> <intent-filter android:priority="1"> <action android:name="com.android.settings.USER_DICTIONARY_INSERT" /> - <action android:name="com.android.settings.USER_DICTIONARY_EDIT" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" @@ -1754,27 +1753,6 @@ <activity android:name=".AppPicker" android:label="@string/select_application" android:theme="@style/Theme.AppPicker" /> - <activity android:name="Settings$UsbSettingsActivity" - android:label="@string/storage_title_usb" - android:taskAffinity="com.android.settings" - android:parentActivityName="Settings$StorageSettingsActivity"> - <intent-filter android:priority="1"> - <action android:name="android.settings.STORAGE_USB_SETTINGS" /> - <action android:name="com.android.settings.STORAGE_USB_SETTINGS" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <meta-data android:name="com.android.settings.FRAGMENT_CLASS" - android:value="com.android.settings.deviceinfo.UsbSettings" /> - <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" - android:resource="@id/storage_settings" /> - <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" - android:value="true" /> - </activity> - <!-- Keep compatibility with old shortcuts. --> <activity-alias android:name="UsbSettings" android:exported="true" diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index d39132b..55c9b73 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"Werkverrigting"</string> <string name="total_memory" msgid="2017287600738630165">"Totale geheue"</string> <string name="average_used" msgid="5338339266517245782">"Gemiddeld gebruik (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Gratis"</string> + <string name="free_memory" msgid="4003936141603549746">"Beskikbaar"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Geheue wat deur programme gebruik word"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> programme het geheue gebruik in die afgelope <xliff:g id="DURATION_1">%2$s</xliff:g></item> diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml index 9e7c198..43e2303 100644 --- a/res/values-az-rAZ/strings.xml +++ b/res/values-az-rAZ/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"İş göstəricisi"</string> <string name="total_memory" msgid="2017287600738630165">"Ümumi yaddaş"</string> <string name="average_used" msgid="5338339266517245782">"Orta istifadə (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Ödənişsiz"</string> + <string name="free_memory" msgid="4003936141603549746">"Boş"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Tətbiq tərəfindən istifadə olunmuş yaddaş"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other">Son <xliff:g id="DURATION_1">%2$s</xliff:g> ərzində yaddaşı <xliff:g id="COUNT">%1$d</xliff:g> tətbiq istifadə edib</item> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index ae9aa13..e438d2f 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"Ефективност"</string> <string name="total_memory" msgid="2017287600738630165">"Общо памет"</string> <string name="average_used" msgid="5338339266517245782">"Средно използвана (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Свободно"</string> + <string name="free_memory" msgid="4003936141603549746">"Свободна памет"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Използвана от приложенията памет"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> приложения са използвали памет през последния период от <xliff:g id="DURATION_1">%2$s</xliff:g></item> diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 7dcddb3..5508910 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"কার্য-সম্পাদনা"</string> <string name="total_memory" msgid="2017287600738630165">"মোট মেমরি"</string> <string name="average_used" msgid="5338339266517245782">"ব্যবহৃত গড় (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"বিনামূল্যে"</string> + <string name="free_memory" msgid="4003936141603549746">"খালি আছে"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"অ্যাপ্লিকেশানগুলির দ্বারা ব্যবহৃত মেমরি"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g>টি অ্যাপ্লিকেশান শেষ <xliff:g id="DURATION_1">%2$s</xliff:g> মেমরি ব্যবহার করেছে</item> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index d1f78f0..d44bfc9 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -344,7 +344,7 @@ <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Molt bé. Repeteix-ho"</string> <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mou el dit lleugerament perquè es pugui captar l’empremta digital sencera"</string> <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Empremta dig. afegida"</string> - <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quan vegis aquesta icona, pots fer servir la teva empremta digital per identificar o per autoritzar una compra."</string> + <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quan vegis aquesta icona, pots fer servir la teva empremta digital per identificar-te o per autoritzar una compra."</string> <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Toca el sensor d\'empremtes digitals per activar i desbloquejar el dispositiu."</string> <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Quan vegis aquesta icona, pots fer servir la teva empremta digital."</string> <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Sortir de configuració d\'empremta digital?"</string> @@ -1616,7 +1616,7 @@ <string name="accessibility_display_inversion_preference_subtitle" msgid="8658240868230680912">"(Experimental) Pot afectar el rendiment."</string> <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Correcció del color"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Aquesta funció és experimental i pot afectar el rendiment."</string> - <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra a la configuració ràpida"</string> + <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra a Configuració ràpida"</string> <string name="daltonizer_type" msgid="1124178250809091080">"Mode de correcció"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"S\'ha substituït per <xliff:g id="TITLE">%1$s</xliff:g>"</string> <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"Desactivat"</string> @@ -2510,7 +2510,7 @@ <string name="keywords_all_apps" msgid="5377153522551809915">"aplicacions baixada aplicacions sistema"</string> <string name="keywords_app_permissions" msgid="8677901415217188314">"seguretat per als permisos d\'aplicacions"</string> <string name="keywords_default_apps" msgid="3581727483175522599">"aplicacions predeterminades"</string> - <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorar optimitzacions migdiada aplicació en espera"</string> + <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorar optimitzacions migdiada aplicació inactiva"</string> <string name="keywords_color_mode" msgid="4670570451841540200">"estàndard natural color RGB sRGB vibrant"</string> <string name="keywords_lockscreen" msgid="4806191868723291541">"lliscar, contrasenya, patró, PIN"</string> <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura l\'etiqueta de NFC per a Wi-Fi"</string> @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"Rendiment"</string> <string name="total_memory" msgid="2017287600738630165">"Memòria total"</string> <string name="average_used" msgid="5338339266517245782">"Mitjana utilitzada (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Disponible"</string> + <string name="free_memory" msgid="4003936141603549746">"Memòria disponible"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Memòria utilitzada per les aplicacions"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicacions han utilitzat memòria durant les últimes <xliff:g id="DURATION_1">%2$s</xliff:g></item> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 01a5ec4..078b8d3 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -491,7 +491,7 @@ <string name="manage_device_admin_summary" msgid="7672709110988761075">"Vis eller deaktiver enhedsadministratorer"</string> <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string> <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Hvis du vil bruge dette, skal du først indstille en skærmlås"</string> - <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Se eller deaktivere trust agents"</string> + <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Se eller deaktiver trust agents"</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="1810521656168174329">"Bluetooth"</string> @@ -743,7 +743,7 @@ <string name="wifi_hotspot_checkbox_text_summary" msgid="3800646230853724318">"Brug mobilforbindelsen til angivelse Wi-Fi-netværk"</string> <string name="wifi_tether_starting" msgid="1322237938998639724">"Aktiverer hotspot..."</string> <string name="wifi_tether_stopping" msgid="4835852171686388107">"Deaktiverer hotspot..."</string> - <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Det mobile hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktivt"</string> + <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobilhotspottet <xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktivt"</string> <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Fejl ved mobilt Wi-Fi-hotspot"</string> <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfiguration af Wi-Fi-hotspot"</string> <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Konfiguration af Wi-Fi-hotspot"</string> @@ -908,7 +908,7 @@ <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status for batteri, netværk og andre oplysninger"</string> <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonnummer, signal osv."</string> <string name="storage_settings" msgid="4211799979832404953">"Lagerplads"</string> - <string name="storage_usb_settings" msgid="642612065405691122">"Lager og USB"</string> + <string name="storage_usb_settings" msgid="642612065405691122">"Lagerplads og USB"</string> <string name="storage_settings_title" msgid="8746016738388094064">"Indstillinger for lagerplads"</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> @@ -1000,8 +1000,8 @@ <string name="storage_external_title" msgid="3433462910096848696">"Ekstern lagerplads"</string> <string name="storage_volume_summary" msgid="7023441974367853372">"Der er anvendt <xliff:g id="USED">%1$s</xliff:g> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string> <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string> - <string name="storage_volume_used" msgid="1303803057698959872">"Lagerplads, der er anvendt ud af <xliff:g id="TOTAL">%1$s</xliff:g>"</string> - <string name="storage_volume_used_total" msgid="6113121714019000244">"Samlet lagerplads, der er anvendt ud af <xliff:g id="TOTAL">%1$s</xliff:g>"</string> + <string name="storage_volume_used" msgid="1303803057698959872">"Anvendt lagerplads ud af <xliff:g id="TOTAL">%1$s</xliff:g>"</string> + <string name="storage_volume_used_total" msgid="6113121714019000244">"Samlet anvendt lagerplads ud af <xliff:g id="TOTAL">%1$s</xliff:g>"</string> <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> blev monteret"</string> <string name="storage_mount_failure" msgid="1042621107954547316">"<xliff:g id="NAME">%1$s</xliff:g> kunne ikke monteres"</string> <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> blev skubbet sikkert ud"</string> @@ -2403,7 +2403,7 @@ <string name="cell_broadcast_settings" msgid="2451014351355183338">"Nødudsendelser"</string> <string name="network_operators_settings" msgid="2583178259504630435">"Netværksudbydere"</string> <string name="access_point_names" msgid="1381602020438634481">"Adgangspunkter (APN)"</string> - <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Forbedret 4G LTE-tilstand"</string> + <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Udvidet 4G LTE-tilstand"</string> <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Brug LTE-data til at forbedre indtalingslyden og kommunikationen (anbefales)"</string> <string name="preferred_network_type_title" msgid="3431041717309776341">"Foretrukken netværkstype"</string> <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (anbefales)"</string> @@ -2510,7 +2510,7 @@ <string name="keywords_all_apps" msgid="5377153522551809915">"system til download af applikationer"</string> <string name="keywords_app_permissions" msgid="8677901415217188314">"apps tilladelser sikkerhed"</string> <string name="keywords_default_apps" msgid="3581727483175522599">"apps standard"</string> - <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorer, optimeringer, doze-app, standby"</string> + <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorer, optimeringer, hvil, app standby"</string> <string name="keywords_color_mode" msgid="4670570451841540200">"klare rgb srgb farve naturlige standard"</string> <string name="keywords_lockscreen" msgid="4806191868723291541">"stryg adgangskode mønster pinkode"</string> <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string> @@ -2828,7 +2828,7 @@ <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Brug skærmbillede"</string> <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Giv assistanceappen adgang til et billede af skærmen"</string> <string name="assist_footer" msgid="1982791172085896864">"Assistanceapps kan hjælpe dig med afsæt i oplysningerne på den aktuelle skærm. Nogle apps understøtter både startertjenester og tjenester til taleinput for at give dig integreret assistance."</string> - <string name="average_memory_use" msgid="829566450150198512">"Gennemsnit. hukommelsesforbrug"</string> + <string name="average_memory_use" msgid="829566450150198512">"Gennemsnitligt hukommelsesforbrug"</string> <string name="maximum_memory_use" msgid="7493720799710132496">"Maksimal hukommelsesforbrug"</string> <string name="memory_usage" msgid="1781358557214390033">"Hukommelsesforbrug"</string> <string name="app_list_memory_use" msgid="6987417883876419338">"Appforbrug"</string> @@ -2837,7 +2837,7 @@ <string name="no_memory_use_summary" msgid="2016900536806235588">"Der er ikke brugt hukommelse inden for de sidste tre timer"</string> <string name="sort_avg_use" msgid="3998036180505143129">"Sortér efter gennemsnitligt forbrug"</string> <string name="sort_max_use" msgid="4629247978290075124">"Sortér efter maksimal forbrug"</string> - <string name="memory_performance" msgid="5661005192284103281">"Præstation"</string> + <string name="memory_performance" msgid="5661005192284103281">"Ydelse"</string> <string name="total_memory" msgid="2017287600738630165">"Hukommelse i alt"</string> <string name="average_used" msgid="5338339266517245782">"Brugt i gennemsnit (%)"</string> <string name="free_memory" msgid="4003936141603549746">"Ledig"</string> @@ -2873,12 +2873,12 @@ <string name="filter_overlay_apps" msgid="6965969283342557573">"Apps med tilladelse"</string> <string name="system_alert_window_on" msgid="2939489395109048888">"Ja"</string> <string name="system_alert_window_off" msgid="6189115687233061992">"Nej"</string> - <string name="write_settings" msgid="4797457275727195681">"Skift systemindstillinger"</string> + <string name="write_settings" msgid="4797457275727195681">"Rediger systemindstillinger"</string> <string name="keywords_write_settings" msgid="6415597272561105138">"redigere ændre systemindstillinger"</string> <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_0">%d</xliff:g> af <xliff:g id="COUNT_1">%d</xliff:g> apps med tilladelse til at ændre systemindstillinger"</string> <string name="filter_write_settings_apps" msgid="2914615026197322551">"Apps, som kan ændre systemindstillinger"</string> <string name="write_settings_title" msgid="4232152481902542284">"Apps, som kan ændre systemindstillinger"</string> - <string name="write_system_settings" msgid="3482913590601096763">"Skift systemindstillinger"</string> + <string name="write_system_settings" msgid="3482913590601096763">"Rediger systemindstillinger"</string> <string name="write_settings_preference" msgid="3407383041273067448">"Apptilladelse til at ændre systemindstillinger"</string> <string name="permit_write_settings" msgid="6393779336656870080">"Tillad ændring af systemindstillinger"</string> <string name="write_settings_description" msgid="6868293938839954623">"Denne tilladelse giver en app lov til at ændre systemindstillinger."</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 3d2d744..41dfc95 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -1001,7 +1001,7 @@ <string name="storage_external_title" msgid="3433462910096848696">"Mobiler Speicher"</string> <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="USED">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g> verwendet"</string> <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string> - <string name="storage_volume_used" msgid="1303803057698959872">"Von <xliff:g id="TOTAL">%1$s</xliff:g> verwendet"</string> + <string name="storage_volume_used" msgid="1303803057698959872">"von <xliff:g id="TOTAL">%1$s</xliff:g> verwendet"</string> <string name="storage_volume_used_total" msgid="6113121714019000244">"Von <xliff:g id="TOTAL">%1$s</xliff:g> insgesamt verwendet"</string> <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> wurde bereitgestellt."</string> <string name="storage_mount_failure" msgid="1042621107954547316">"<xliff:g id="NAME">%1$s</xliff:g> konnte nicht bereitgestellt werden."</string> @@ -1047,7 +1047,7 @@ <string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"Das Verschieben dauert etwa <xliff:g id="TIME">^1</xliff:g>. Dabei werden <xliff:g id="SIZE">^2</xliff:g> auf <xliff:g id="NAME">^3</xliff:g> freigegeben."</b></string> <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Verschieben"</string> <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Daten werden verschoben…"</string> - <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"Beachten Sie beim Verschieben Ihrer Daten Folgendes: \n• Entfernen Sie die <xliff:g id="NAME">^1</xliff:g> nicht. \n• Einige Apps funktionieren möglicherweise nicht. \n• Achten Sie darauf, dass das Gerät dabei stets geladen wird."</string> + <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"Beachten Sie beim Verschieben Ihrer Daten Folgendes: \n• Entfernen Sie nicht den Datenspeicher (<xliff:g id="NAME">^1</xliff:g>). \n• Einige Apps funktionieren möglicherweise nicht. \n• Achten Sie darauf, dass das Gerät dabei stets geladen wird."</string> <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> steht für Sie bereit"</string> <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Sie können Ihre <xliff:g id="NAME">^1</xliff:g> nun zum Speichern von Fotos und anderen Medien einsetzen."</string> <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Ihre neue <xliff:g id="NAME">^1</xliff:g> steht nun für Sie bereit. \n\nWenn Sie Fotos, Dateien und App-Daten auf dieses Gerät verschieben möchten, gehen Sie zu \"Einstellungen\" > \"Speicher\"."</string> @@ -2511,7 +2511,7 @@ <string name="keywords_all_apps" msgid="5377153522551809915">"App-System für App-Download"</string> <string name="keywords_app_permissions" msgid="8677901415217188314">"App-Berechtigungen – Sicherheit"</string> <string name="keywords_default_apps" msgid="3581727483175522599">"Apps-Standardeinstellung"</string> - <string name="keywords_ignore_optimizations" msgid="946516741848647905">"Ignorieren Optimierungen Stromsparmodus App Standby"</string> + <string name="keywords_ignore_optimizations" msgid="946516741848647905">"Ignorieren Optimierungen Stromsparmodus App-Standby"</string> <string name="keywords_color_mode" msgid="4670570451841540200">"brillant rgb srgb farbe natürlich standard"</string> <string name="keywords_lockscreen" msgid="4806191868723291541">"ziehen passwort muster pin slide password pattern"</string> <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WLAN-NFC-Tag einrichten"</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 0ebaba2..1a3d2da 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -2838,7 +2838,7 @@ <string name="memory_performance" msgid="5661005192284103281">"Rendimiento"</string> <string name="total_memory" msgid="2017287600738630165">"Memoria total"</string> <string name="average_used" msgid="5338339266517245782">"Uso promedio (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Libre"</string> + <string name="free_memory" msgid="4003936141603549746">"Libre(s)"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Memoria que utilizan las aplicaciones"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicaciones usaron la memoria en las últimas <xliff:g id="DURATION_1">%2$s</xliff:g>.</item> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index baab32b..228077d 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -998,9 +998,9 @@ <string name="storage_other_users" msgid="808708845102611856">"Otros usuarios"</string> <string name="storage_internal_title" msgid="690771193137801021">"Almacenamiento del dispositivo"</string> <string name="storage_external_title" msgid="3433462910096848696">"Almacenamiento portátil"</string> - <string name="storage_volume_summary" msgid="7023441974367853372">"Utilizado: <xliff:g id="USED">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string> + <string name="storage_volume_summary" msgid="7023441974367853372">"Usado: <xliff:g id="USED">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string> <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string> - <string name="storage_volume_used" msgid="1303803057698959872">"Utilizado de <xliff:g id="TOTAL">%1$s</xliff:g>"</string> + <string name="storage_volume_used" msgid="1303803057698959872">"En uso de <xliff:g id="TOTAL">%1$s</xliff:g>"</string> <string name="storage_volume_used_total" msgid="6113121714019000244">"Total utilizado de <xliff:g id="TOTAL">%1$s</xliff:g>"</string> <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> se ha activado"</string> <string name="storage_mount_failure" msgid="1042621107954547316">"Error al activar <xliff:g id="NAME">%1$s</xliff:g>"</string> @@ -2646,7 +2646,7 @@ <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string> <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string> <string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string> - <string name="device_feedback" msgid="3238056036766293294">"Dar tu opinión sobre el dispositivo"</string> + <string name="device_feedback" msgid="3238056036766293294">"Enviar sugerencias sobre el dispositivo"</string> <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Introduce el PIN del administrador"</string> <string name="switch_on_text" msgid="1124106706920572386">"Sí"</string> <string name="switch_off_text" msgid="1139356348100829659">"No"</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 2eb66f4..383348f 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="yes" msgid="4676390750360727396">"بله"</string> - <string name="no" msgid="6731231425810196216">"خیر"</string> + <string name="no" msgid="6731231425810196216">"نه"</string> <string name="create" msgid="3578857613172647409">"ایجاد"</string> <string name="allow" msgid="3349662621170855910">"مجاز است"</string> <string name="deny" msgid="6947806159746484865">"اجازه ندارد"</string> @@ -2677,9 +2677,9 @@ <string name="encrypt_require_pin" msgid="2063945047845243752">"برای راهاندازی دستگاه، پین مورد نیاز است"</string> <string name="encrypt_require_pattern" msgid="6898479411004015810">"برای راهاندازی دستگاه، کشیدن الگو مورد نیاز است"</string> <string name="encrypt_require_password" msgid="8770628366276570518">"برای راهاندازی دستگاه، گذرواژه مورد نیاز است"</string> - <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"خیر، سپاسگزارم"</string> - <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"خیر، سپاسگزارم"</string> - <string name="encrypt_dont_require_password" msgid="2580403214917009046">"خیر، سپاسگزارم"</string> + <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"نه سپاسگزارم"</string> + <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"نه سپاسگزارم"</string> + <string name="encrypt_dont_require_password" msgid="2580403214917009046">"نه سپاسگزارم"</string> <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"پین درخواست شود؟"</string> <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"الگو درخواست شود؟"</string> <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"گذرواژه درخواست شود؟"</string> @@ -2872,7 +2872,7 @@ <string name="system_alert_window_summary" msgid="4268867238063922290">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> برنامه برای نمایش روی سایر برنامهها مجازند"</string> <string name="filter_overlay_apps" msgid="6965969283342557573">"برنامههای دارای مجوز"</string> <string name="system_alert_window_on" msgid="2939489395109048888">"بله"</string> - <string name="system_alert_window_off" msgid="6189115687233061992">"خیر"</string> + <string name="system_alert_window_off" msgid="6189115687233061992">"نه"</string> <string name="write_settings" msgid="4797457275727195681">"تغییر تنظیمات سیستم"</string> <string name="keywords_write_settings" msgid="6415597272561105138">"نوشتن اصلاح تنظیمات سیستم"</string> <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_0">%d</xliff:g> برنامه از <xliff:g id="COUNT_1">%d</xliff:g> برنامه میتوانند تنظیمات سیستم را تغییر دهند"</string> @@ -2883,7 +2883,7 @@ <string name="permit_write_settings" msgid="6393779336656870080">"اجازه دادن به برنامه برای تغییر تنظیمات سیستم"</string> <string name="write_settings_description" msgid="6868293938839954623">"این مجوز به برنامه امکان میدهد تنظیمات سیستم را تغییر دهد."</string> <string name="write_settings_on" msgid="8230580416068832239">"بله"</string> - <string name="write_settings_off" msgid="5156104383386336233">"خیر"</string> + <string name="write_settings_off" msgid="5156104383386336233">"نه"</string> <string name="camera_gesture_title" msgid="1075838577642393011">"دو بار بچرخانید تا دوربین باز شود"</string> <string name="camera_gesture_desc" msgid="1831390075255870960">"با دو بار چرخاندن مچتان، برنامه دوربین را باز کنید"</string> <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"دو ضربه روی دکمه روشن/خاموش برای دوربین"</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 4eb72c5..951f586 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"Tehokkuus"</string> <string name="total_memory" msgid="2017287600738630165">"Muistia yhteensä"</string> <string name="average_used" msgid="5338339266517245782">"Käytetty keskimäärin (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Ilmainen"</string> + <string name="free_memory" msgid="4003936141603549746">"Vapaana"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Sovellusten käyttämä muisti"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other">viimeiset <xliff:g id="DURATION_1">%2$s</xliff:g>: <xliff:g id="COUNT">%1$d</xliff:g> sovellusta käytti muistia</item> diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml index d77d4d8..d286319 100644 --- a/res/values-gl-rES/strings.xml +++ b/res/values-gl-rES/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"Rendemento"</string> <string name="total_memory" msgid="2017287600738630165">"Memoria total"</string> <string name="average_used" msgid="5338339266517245782">"Media utilizada (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Libre"</string> + <string name="free_memory" msgid="4003936141603549746">"Dispoñible"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Memoria usada polas aplicacións"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicacións usaron a memoria nas últimas <xliff:g id="DURATION_1">%2$s</xliff:g></item> diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml index 05e773b..3f2ecc6 100644 --- a/res/values-gu-rIN/strings.xml +++ b/res/values-gu-rIN/strings.xml @@ -2842,7 +2842,7 @@ <string name="memory_performance" msgid="5661005192284103281">"પ્રદર્શન"</string> <string name="total_memory" msgid="2017287600738630165">"કુલ મેમરી"</string> <string name="average_used" msgid="5338339266517245782">"સરેરાશ વપરાશ (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"મફત"</string> + <string name="free_memory" msgid="4003936141603549746">"ખાલી"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"એપ્લિકેશનો દ્વારા વપરાયેલ મેમરી"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> એપ્લિકેશન એ છેલ્લા <xliff:g id="DURATION_1">%2$s</xliff:g> માં મેમરી ઉપયોગ કરી</item> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index b181a0b..131b531 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -2839,8 +2839,8 @@ <string name="sort_max_use" msgid="4629247978290075124">"Տեսակավորել ըստ առավելագույն օգտագործման"</string> <string name="memory_performance" msgid="5661005192284103281">"Արդյունավետություն"</string> <string name="total_memory" msgid="2017287600738630165">"Ընդհանուր հիշողությունը"</string> - <string name="average_used" msgid="5338339266517245782">"Օգտագործած միջինը (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Ազատ"</string> + <string name="average_used" msgid="5338339266517245782">"Միջին օգագործում (%)"</string> + <string name="free_memory" msgid="4003936141603549746">"Ազատ է"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Հավելվածների օգտագործած հիշողություն"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> հավելված օգտագործել է հիշողությունը վերջին <xliff:g id="DURATION_1">%2$s</xliff:g>-ում</item> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 1c6747f..f2cb83f 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"Kinerja"</string> <string name="total_memory" msgid="2017287600738630165">"Total memori"</string> <string name="average_used" msgid="5338339266517245782">"Rata-rata digunakan (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Kosong"</string> + <string name="free_memory" msgid="4003936141603549746">"Bebas"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Memori yang digunakan oleh aplikasi"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikasi menggunakan memori dalam <xliff:g id="DURATION_1">%2$s</xliff:g> terakhir</item> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 54996c0..5da2933 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -2612,7 +2612,7 @@ <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Ogni giorno"</string> <string name="summary_divider_text" msgid="7228986578690919294">", "</string> <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string> - <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Dal <xliff:g id="START">%1$s</xliff:g> al <xliff:g id="END">%2$s</xliff:g>"</string> + <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Dalle <xliff:g id="START">%1$s</xliff:g> alle <xliff:g id="END">%2$s</xliff:g>"</string> <string name="zen_mode_calls" msgid="7051492091133751208">"Chiamate"</string> <string name="zen_mode_messages" msgid="5886440273537510894">"Messaggi"</string> <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Messaggi selezionati"</string> @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"Prestazioni"</string> <string name="total_memory" msgid="2017287600738630165">"Memoria totale"</string> <string name="average_used" msgid="5338339266517245782">"Utilizzo medio (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Libera"</string> + <string name="free_memory" msgid="4003936141603549746">"Memoria disponibile"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Memoria utilizzata dalle app"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> app hanno utilizzato la memoria nelle ultime <xliff:g id="DURATION_1">%2$s</xliff:g></item> diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml index 03221f5..d524aad 100644 --- a/res/values-kn-rIN/strings.xml +++ b/res/values-kn-rIN/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"ಕಾರ್ಯಕ್ಷಮತೆ"</string> <string name="total_memory" msgid="2017287600738630165">"ಒಟ್ಟು ಮೆಮೊರಿ"</string> <string name="average_used" msgid="5338339266517245782">"ಬಳಸಿದ ಸರಾಸರಿ (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"ಖಾಲಿ"</string> + <string name="free_memory" msgid="4003936141603549746">"ಲಭ್ಯವಿರುವುದು"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"ಅಪ್ಲಿಕೇಶನ್ಗಳು ಬಳಸಿರುವ ಮೆಮೊರಿ"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್ಗಳು ಕೊನೆಯದಾಗಿ <xliff:g id="DURATION_1">%2$s</xliff:g> ಮೆಮೊರಿ ಬಳಸಿವೆ</item> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index a173b78..040a0e0 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -998,9 +998,9 @@ <string name="storage_other_users" msgid="808708845102611856">"다른 사용자"</string> <string name="storage_internal_title" msgid="690771193137801021">"기기 저장용량"</string> <string name="storage_external_title" msgid="3433462910096848696">"휴대용 저장소"</string> - <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="TOTAL">%2$s</xliff:g> 중 <xliff:g id="USED">%1$s</xliff:g> 사용"</string> + <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="USED">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string> <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>"<xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string> - <string name="storage_volume_used" msgid="1303803057698959872">"<xliff:g id="TOTAL">%1$s</xliff:g> 중 사용"</string> + <string name="storage_volume_used" msgid="1303803057698959872">"/ <xliff:g id="TOTAL">%1$s</xliff:g>"</string> <string name="storage_volume_used_total" msgid="6113121714019000244">"<xliff:g id="TOTAL">%1$s</xliff:g> 중 총 사용"</string> <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g>이(가) 마운트되었습니다."</string> <string name="storage_mount_failure" msgid="1042621107954547316">"<xliff:g id="NAME">%1$s</xliff:g>을(를) 마운트하지 못했습니다."</string> diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml index b8a7085..74710e1 100644 --- a/res/values-ky-rKG/strings.xml +++ b/res/values-ky-rKG/strings.xml @@ -2385,7 +2385,7 @@ <string name="restriction_menu_reset" msgid="2067644523489568173">"Чектөөлөрдү жок кылуу"</string> <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN алмаштыруу"</string> <string name="app_notifications_switch_label" msgid="9124072219553687583">"Эскертүүнү көргөзүү"</string> - <string name="help_label" msgid="6886837949306318591">"Жардам & жооп пикир"</string> + <string name="help_label" msgid="6886837949306318591">"Жардам жана жооп пикир"</string> <string name="user_account_title" msgid="1127193807312271167">"Мазмун үчүн эсеп"</string> <string name="user_picture_title" msgid="7297782792000291692">"Сүрөттүн ID\'си"</string> <string name="extreme_threats_title" msgid="6549541803542968699">"Олуттуу коркунучтар"</string> diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 65fdabf..15b40a0 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -1673,7 +1673,7 @@ <string name="accessibility_no_services_installed" msgid="7200948194639038807">"സേവനങ്ങളൊന്നും ഇൻസ്റ്റാളുചെയ്തിട്ടില്ല"</string> <string name="accessibility_service_default_description" msgid="1072730037861494125">"വിവരണമൊന്നും നൽകിയിട്ടില്ല."</string> <string name="settings_button" msgid="3006713718908152930">"ക്രമീകരണങ്ങൾ"</string> - <string name="print_settings" msgid="4742428530112487843">"പ്രിന്റുചെയ്യുന്നു"</string> + <string name="print_settings" msgid="4742428530112487843">"പ്രിന്റിംഗ്"</string> <string name="print_settings_title" msgid="3685449667822217816">"പ്രിന്റ് സേവനങ്ങൾ"</string> <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> ഉപയോഗിക്കണോ?"</string> <string name="print_service_security_warning_summary" msgid="7567131958613064363">"നിങ്ങളുടെ പ്രമാണം പ്രിന്ററിലേക്ക് പോകുന്നതിനിടെ അത് ഒന്നോ അതിലധികമോ സെർവറുകളിലൂടെ കടന്നുപോകാനിടയുണ്ട്."</string> diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml index 78d0f44..0d78a17 100644 --- a/res/values-mr-rIN/strings.xml +++ b/res/values-mr-rIN/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"कार्यप्रदर्शन"</string> <string name="total_memory" msgid="2017287600738630165">"एकूण मेमरी"</string> <string name="average_used" msgid="5338339266517245782">"सरासरी वापरली (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"मोकळी"</string> + <string name="free_memory" msgid="4003936141603549746">"उपलब्ध"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"अॅप्सद्वारे वापरलेली मेमरी"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="one">गेल्या <xliff:g id="DURATION_1">%2$s</xliff:g> मध्ये <xliff:g id="COUNT">%1$d</xliff:g> अॅपने मेमरी वापरली</item> diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml index dfb7437..3cecd91 100644 --- a/res/values-my-rMM/strings.xml +++ b/res/values-my-rMM/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"ဖျော်ဖြေတင်ဆက်မှု"</string> <string name="total_memory" msgid="2017287600738630165">"စုစုပေါင်း မှတ်ဉာဏ်"</string> <string name="average_used" msgid="5338339266517245782">"ပျမ်းမျှ အသုံးပြုမှု (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"အလွတ်"</string> + <string name="free_memory" msgid="4003936141603549746">"လက်ကျန်"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"App များမှ အသုံးပြုသော မှတ်ဉာဏ်"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other"> App <xliff:g id="COUNT">%1$d</xliff:g> သည် မှတ်ဉာဏ်အား လွန်ခဲ့သော <xliff:g id="DURATION_1">%2$s</xliff:g> က သုံးခဲ့၏</item> diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index c67bfb5..91633bf 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -28,7 +28,7 @@ <item quantity="other">अहिले तपाईँ विकासकर्ता हुनका लागि <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण टाढा हुनुहुन्छ।</item> <item quantity="one">अहिले तपाईँ विकासकर्ता हुनका लागि <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> चरण टाढा हुनुहुन्छ।</item> </plurals> - <string name="show_dev_on" msgid="1110711554982716293">"तपाईं अब एउटा विकासकर्ता हुनुहुन्छ!"</string> + <string name="show_dev_on" msgid="1110711554982716293">"तपाईँ अब एउटा विकासकर्ता हुनुहुन्छ!"</string> <string name="show_dev_already" msgid="2151632240145446227">"आवश्यक छैन, तपाईँ आफैँ नै एउटा विकासकर्ता हुनुहुन्छ।"</string> <string name="header_category_wireless_networks" msgid="5110914332313954940">"ताररहित र सञ्जालहरू"</string> <string name="header_category_connections" msgid="6471513040815680662">"जडानहरू"</string> @@ -126,7 +126,7 @@ <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"एक अनुप्रयोगले तपाईँको ट्याब्लेटलाई अन्य ब्लुटुथ उपकरणहरूले हेर्न मिल्ने बनाउन चाहन्छ<xliff:g id="TIMEOUT">%1$d</xliff:g> सेकेन्डका लागि।"</string> <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"एउटा अनुप्रयोगले तपाईंको फोन अन्य ब्लुटुथ उपकरणहरूमा <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकेन्डको लागि प्रदर्शन गर्न चाहन्छ।"</string> <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"एउटा अनुप्रयोगले तपाईँको ट्याब्लेटलाई अन्य ब्लुटुथ उपकरणहरूमा लागि देखिने बनाउन खोजिरहेको छ। तपाईँले यसलाई पछि ब्लुटुथ सेटिङहरूमा परिवर्तन गर्न सक्नु हुन्छ।"</string> - <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"एउटा अनुप्रयोगले तपाईंको फोनलाई अन्य ब्लुटुथ उपकरणहरूमा प्रदर्शन गर्न चाहन्छ। तपाईं यसलाई पछि ब्लुटुथ सेटिङहरूमा परिवर्तन गर्न सक्नुहुने छ।"</string> + <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"एउटा अनुप्रयोगले तपाईँको फोनलाई अन्य ब्लुटुथ उपकरणहरूमा प्रदर्शन गर्न चाहन्छ। तपाईँ यसलाई पछि ब्लुटुथ सेटिङहरूमा परिवर्तन गर्न सक्नुहुने छ।"</string> <string name="bluetooth_ask_start_broadcast" product="default" msgid="3535628155254187911">"नजिकको अरू उपकरणहरू सँग कुराकानी गर्न <xliff:g id="APP_NAME">%1$s</xliff:g> ले ब्लूटूथ प्रसारण खोल्न चाहन्छ। तपाईँले पछि यसलाई ब्लूटूथ सेटिङ्हरूमा बदल्न सक्नुहुन्छ।"</string> <string name="bluetooth_ask_enablement_and_start_broadcast" product="default" msgid="8810858601242763295">"<xliff:g id="APP_NAME">%1$s</xliff:g> नजिकैको अन्य उपकरणको साथ कुराकानी गर्न ब्लूटूथ वा ब्लूटूथ प्रसारण खोल्न चाहन्छ। तपाईँले पछि यसलाई ब्लूटूथ सेटिङ्हरूमा बदल्न सक्नुहुन्छ।"</string> <string name="bluetooth_broadcasting_explaination" product="default" msgid="4249322115655011799">"जब यो विशेषता सक्रिय हुन्छ, तपाईँको फोनले नजिकको अरू उपकरणहरू सँग कुराकानी गर्न सक्छ। \n\nप्रसारणलेे कम उर्जा लाग्ने ब्लुटुथ संकेतहरु प्रयोग गर्छ।"</string> @@ -344,14 +344,14 @@ <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"अति उत्तम! अब दोहोर्याउनुहोस्।"</string> <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"तपाईंको फिंगरप्रिन्टको सबै फरक भागहरु थप्न आफ्नो औंला बिस्तारै सार्नुहोस्"</string> <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"औँठाछाप थपियो!"</string> - <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"तपाईं यस आइकन जहिले देख्नुहुन्छ, तपाईं पहिचानको लागि वा एक खरीद अधिकारको निम्ति आफ्नो औठाछाप प्रयोग गर्न सक्नुहुन्छ।"</string> + <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"तपाईँ यस आइकन जहिले देख्नुहुन्छ, तपाईँ पहिचानको लागि वा एक खरीद अधिकारको निम्ति आफ्नो औठाछाप प्रयोग गर्न सक्नुहुन्छ।"</string> <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"जगाउन र तपाईँको यन्त्रलाई अनलक गर्न फिंगरप्रिन्ट सेन्सरमा छुनुहोस्।"</string> <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"तपाईँले यो आइकन देखेको बेला तपाईँ आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ।"</string> <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फिंगरप्रिन्ट सेटअप छोड्न चाहनुहुन्छ?"</string> <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"तपाईँले आफ्नो फोन अनलक गर्ने एक तरिका रूपमा फिंगरप्रिन्ट छान्नुभएको छ। यदि तपाईँले अहिले छोड्नु भएमा पछि पुन: सेटअप गर्न पर्नेछ। सेटअप गर्न मात्र केहि मिनेट लाग्नेछ।"</string> <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्क्रिन लक सेटअप गर्नुहोस्"</string> <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"सम्पन्न भयो"</string> - <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"आच्यौं, त्यो सेन्सर होईन नि त"</string> + <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"आच्यौं, त्यो सेन्सर होइन नि त"</string> <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"तपाईँको यन्त्रमा फिंगरप्रिन्ट सेन्सर प्रयोग गर्नुहोस्।"</string> <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"दर्ता पूर्ण भएको थिएन"</string> <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"फिंगरप्रिन्ट दर्ताको समय सीमा पुग्यो। पुन: प्रयास गर्नुहोस्।"</string> @@ -883,11 +883,11 @@ <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_message" msgid="301251431163650167">"तपाईँको उपकरणमा <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM मात्र छ। के तपाईँ सेलुलर डाटा, कल, र SMS सन्देशहरूका लागि यो SIM प्रयोग गर्न चाहनुहुन्छ?"</string> <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM PIN कोड गलत छ तपाईंले अाफ्नो उपकरण खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्दर्छ।"</string> <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097"> - <item quantity="other"> गलत SIM PIN कोड, तपाईं सँग <xliff:g id="NUMBER_1">%d</xliff:g> पटक प्रयास बाँकी छ।</item> - <item quantity="one">SIM PIN कोड गलत छ, तपाईंले अाफ्नो यन्त्र खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्न अघि तपाईंसँग <xliff:g id="NUMBER_0">%d</xliff:g> पटक प्रयास बाँकी छ।</item> + <item quantity="other"> गलत SIM PIN कोड, तपाईँ सँग <xliff:g id="NUMBER_1">%d</xliff:g> पटक प्रयास बाँकी छ।</item> + <item quantity="one">SIM PIN कोड गलत छ, तपाईँले अाफ्नो यन्त्र खोल्नलाई तपाईँको वाहकसँग सम्पर्क गर्नै पर्न अघि तपाईँसँग <xliff:g id="NUMBER_0">%d</xliff:g> पटक प्रयास बाँकी छ।</item> </plurals> <string name="pin_failed" msgid="1848423634948587645">"SIM PIN कार्य बिफल भयो!"</string> <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ट्याब्लेट वस्तुस्थिति"</string> @@ -1055,7 +1055,7 @@ <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"सार्दै <xliff:g id="APP">^1</xliff:g>..."</string> <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"सार्ने क्रममा <xliff:g id="NAME">^1</xliff:g> नहटाउनुहोस्। \n\nसार्ने क्रम पूरा नहुन्जेल सम्म यो यन्त्रको<xliff:g id="APP">^2</xliff:g> अनुप्रयोग उपलब्ध हुने छैन।"</string> <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"सार्ने कार्य रद्द गर्नुहोस्"</string> - <string name="storage_wizard_slow_body" msgid="8010127667184768025">"यो <xliff:g id="NAME_0">^1</xliff:g> सुस्त जस्तो देखिन्छ। \n\n तपाईं जारी राख्न सक्नुहुन्छ, तर यस स्थानमा सारिएका अनुप्रयोगहरू अड्किन सक्छ र डेटा स्थानान्तरणले लामो समय लिन सक्छ। \n\nराम्रो प्रदर्शनको लागि थप छिटो <xliff:g id="NAME_1">^1</xliff:g> प्रयोग गर्ने विचार गर्नुहोस्।"</string> + <string name="storage_wizard_slow_body" msgid="8010127667184768025">"यो <xliff:g id="NAME_0">^1</xliff:g> सुस्त जस्तो देखिन्छ। \n\n तपाईँ जारी राख्न सक्नुहुन्छ, तर यस स्थानमा सारिएका अनुप्रयोगहरू अड्किन सक्छ र डेटा स्थानान्तरणले लामो समय लिन सक्छ। \n\nराम्रो प्रदर्शनको लागि थप छिटो <xliff:g id="NAME_1">^1</xliff:g> प्रयोग गर्ने विचार गर्नुहोस्।"</string> <string name="battery_status_title" msgid="9159414319574976203">"ब्याट्रि स्थिति"</string> <string name="battery_level_title" msgid="2965679202786873272">"ब्याट्रि स्तर"</string> <string name="apn_settings" msgid="3743170484827528406">"APNs"</string> @@ -1218,7 +1218,7 @@ <string name="regulatory_information" msgid="5695464367088752150">"नियमित जानकारी"</string> <string name="copyright_title" msgid="865906688917260647">"प्रतिलिपि अधिकार"</string> <string name="license_title" msgid="1990487604356037871">"इजाजतपत्र"</string> - <string name="terms_title" msgid="7697580845616764642">"सेवाका सर्तहरू"</string> + <string name="terms_title" msgid="7697580845616764642">"सेवा सर्तहरू"</string> <string name="webview_license_title" msgid="2813507464175738967">"प्रणाली वेबभ्यु लाइसेन्स"</string> <string name="wallpaper_attributions" msgid="3645880512943433928">"वालपेपरहरु"</string> <string name="wallpaper_attributions_values" msgid="2996183537914690469">"स्याटलाइट कल्पना प्रदायकहरू:\n©२०१४ CNES / Astrium, DigitalGlobe, Bluesky"</string> @@ -1394,7 +1394,7 @@ <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"डेटा हटाएर अनुप्रयोग असक्षम पार्ने हो?"</string> <string name="app_special_disable_dlg_text" msgid="1007112763234313018">"तपाईँले यो अनुप्रयोग असक्षम गर्नुभयो भने अन्य अनुप्रयोगहरू अब चाहेजस्तो कार्य नगर्न सक्छ। तपाईँको डेटा पनि मेटाइने छ।"</string> <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"सूचनाहरू बन्द गर्नुहोस्?"</string> - <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"यदि तपाईं यस अनुप्रयोगको लागि सूचनाहरू बन्द गर्नुहुन्छ, तपाईंले महत्त्वपूर्ण अलर्ट र अपडेटहरू गुमाउन सक्नुहुने छ।"</string> + <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"यदि तपाईँ यस अनुप्रयोगको लागि सूचनाहरू बन्द गर्नुहुन्छ, तपाईँले महत्त्वपूर्ण अलर्ट र अपडेटहरू गुमाउन सक्नुहुने छ।"</string> <string name="app_ops_settings" msgid="5108481883575527511">"अनुप्रयोग संचालन"</string> <string name="app_ops_running" msgid="7706949900637284122">"चालु भइरहेको"</string> <string name="app_ops_never_used" msgid="9114608022906887802">"(कहिल्यै प्रयोग नभएको)"</string> @@ -1442,7 +1442,7 @@ <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" product="tablet" msgid="3371302398335665793">"यदि तपाईं यो सेवा रोक्नुहुन्छ भने तपाईंको ट्याब्लेटका केही सुविधाहरूले तपाईंले पावर बन्द गरेर फेरि नखोलेसम्म काम नगर्न सक्दछ।"</string> + <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"यदि तपाईँ यो सेवा रोक्नुहुन्छ भने तपाईँको ट्याब्लेटका केही सुविधाहरूले तपाईँले पावर बन्द गरेर फेरि नखोलेसम्म काम नगर्न सक्दछ।"</string> <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"यदि तपाईँले यस सेवालाई बन्द गर्नु भएको खण्डमा तपाईँको फोनका केही सुविधाहरू सही तवरले काम गर्न बन्द गर्न सक्छन् तबसम्म तपाईँले फेरि यसलाई पावर बन्द गरी फेरि सुरु गर्नु हुन्न।"</string> <string name="language_settings" msgid="5292716747264442359">"भाषा र इनपुट"</string> <string name="language_keyboard_settings_title" msgid="243220021717425813">"भाषा र इनपुट"</string> @@ -1664,8 +1664,8 @@ <string name="enable_service_encryption_warning" msgid="3064686622453974606">"यदि तपाईंले <xliff:g id="SERVICE">%1$s</xliff:g> खोल्नुभयो भने, आफ्नो उपकरणले डेटा गुप्तिकरण अभिवृद्धि गर्न स्क्रिन लक प्रयोग गर्ने छैन।"</string> <string name="secure_lock_encryption_warning" msgid="460911459695077779">"आफ्नो उपकरणले डेटा गुप्तिकरण अभिवृद्धि गर्न स्क्रिन लक प्रयोग गर्ने छैन, किनभने तपाईंले पहुँच सेवा खोल्नुभएको छ।"</string> <string name="enable_service_pattern_reason" msgid="777577618063306751">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेवा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईंले आफ्नो प्याटर्न पुष्टि गर्न आवश्यक छ।"</string> - <string name="enable_service_pin_reason" msgid="7882035264853248228">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेवा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईं आफ्नो PIN पुष्टि गर्न आवश्यक छ।"</string> - <string name="enable_service_password_reason" msgid="1224075277603097951">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेबा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईं आफ्नो पासवर्ड पुष्टि गर्न आवश्यक छ।"</string> + <string name="enable_service_pin_reason" msgid="7882035264853248228">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेवा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईँ आफ्नो PIN पुष्टि गर्न आवश्यक छ।"</string> + <string name="enable_service_password_reason" msgid="1224075277603097951">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेबा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईँ आफ्नो पासवर्ड पुष्टि गर्न आवश्यक छ।"</string> <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"तपाईँका कार्यहरूको अवलोकन गर्नुहोस्"</string> <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"कुनै अनुप्रयोगसँग अन्तरक्रिया गर्दा सूचना प्राप्त गर्नुहोस्।"</string> <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>बन्द गर्नुहुन्छ?"</string> @@ -2335,7 +2335,7 @@ <string name="user_confirm_remove_title" msgid="1163721647646152032">"यो प्रयोगकर्ता हटाउने?"</string> <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"यो प्रोफाइल हटाउने?"</string> <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"कार्य प्रोफाइल हटाउने?"</string> - <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"तपाईं यस ट्याब्लेटमा आफ्नो ठाउँ र डेटा हराउनु हुने छ। तपाईं यो कार्यलाई अन्डु गर्न सक्नुहुन्न।"</string> + <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"तपाईँ यस ट्याब्लेटमा आफ्नो ठाउँ र डेटा हराउनु हुने छ। तपाईँ यो कार्यलाई अन्डु गर्न सक्नुहुन्न।"</string> <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"तपाईँ यस फोनमा तपाईँको ठाउँ र डेटा गुमाउनु हुने छ। तपाईँ यो कार्य पूर्ववत बनाउन सक्नु हुन्न।"</string> <string name="user_confirm_remove_message" msgid="1020629390993095037">"सबै अनुप्रयोगहरू र डेटा मेटाइनेछन्।"</string> <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"यदि तपाईँले जारी राख्नुभयो भने यो प्रोफाइलका सबै अनुप्रयोगहरू र डेटा मेटाइने छन्।"</string> @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"कार्यसम्पादन"</string> <string name="total_memory" msgid="2017287600738630165">"कुल मेमोरी"</string> <string name="average_used" msgid="5338339266517245782">"औसत प्रयोग भएको (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"खाली"</string> + <string name="free_memory" msgid="4003936141603549746">"उपलब्ध"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"अनुप्रयोगहरूद्वारा प्रयोग गरिएको मेमोरी"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगहरूले पछिल्लो <xliff:g id="DURATION_1">%2$s</xliff:g> मा मेमोरी प्रयोग गर्यो</item> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 7939e79..48dfb4b 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -1850,7 +1850,7 @@ <string name="mem_use_native_type" msgid="5976704902328347400">"Natywna"</string> <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Pamięć podręczna jądra"</string> <string name="mem_use_zram_type" msgid="9087217476795358232">"Partycja wymiany modułu ZRam"</string> - <string name="mem_use_free_type" msgid="717708548454880840">"Bezpłatna"</string> + <string name="mem_use_free_type" msgid="717708548454880840">"Wolna"</string> <string name="mem_use_total" msgid="6308786055749777934">"Ogółem"</string> <string name="menu_duration_3h" msgid="4714866438374738385">"3 godziny"</string> <string name="menu_duration_6h" msgid="1940846763432184132">"6 godzin"</string> diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 5194158..3b99130 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -838,7 +838,7 @@ <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string> <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string> <string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string> - <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Sel. pl. de fundo de..."</string> + <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecionar de..."</string> <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string> <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quando encaixado ou suspenso e carregando"</string> <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos"</string> @@ -998,7 +998,7 @@ <string name="storage_other_users" msgid="808708845102611856">"Outros usuários"</string> <string name="storage_internal_title" msgid="690771193137801021">"Armazenamento do dispositivo"</string> <string name="storage_external_title" msgid="3433462910096848696">"Armazenamento portátil"</string> - <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="USED">%1$s</xliff:g> usado(s) de <xliff:g id="TOTAL">%2$s</xliff:g>"</string> + <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="USED">%1$s</xliff:g> usados de um total de <xliff:g id="TOTAL">%2$s</xliff:g>"</string> <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string> <string name="storage_volume_used" msgid="1303803057698959872">"Usado(s) de <xliff:g id="TOTAL">%1$s</xliff:g>"</string> <string name="storage_volume_used_total" msgid="6113121714019000244">"Total usado de <xliff:g id="TOTAL">%1$s</xliff:g>"</string> @@ -1525,7 +1525,7 @@ <string name="bugreport_in_power_summary" msgid="1778455732762984579">"Mostrar um botão para gerar relatórios de bugs no menu do botão liga/desliga"</string> <string name="keep_screen_on" msgid="1146389631208760344">"Permanecer ativo"</string> <string name="keep_screen_on_summary" msgid="2173114350754293009">"A tela nunca entrará em inatividade enquanto estiver carregando."</string> - <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar log de rastr. Bluetooth HCI"</string> + <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar log de rastreamento Bluetooth HCI"</string> <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI em um arquivo"</string> <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueio de OEM"</string> <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permitir que o bootloader seja desbloqueado"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 22d2db6..f25e248 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"Desempenho"</string> <string name="total_memory" msgid="2017287600738630165">"Memória total"</string> <string name="average_used" msgid="5338339266517245782">"Média utilizada (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Livre"</string> + <string name="free_memory" msgid="4003936141603549746">"Disponível"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Memória utilizada pelas aplicações"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações utilizaram a memória nos(as) últimos(as) <xliff:g id="DURATION_1">%2$s</xliff:g></item> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 5194158..3b99130 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -838,7 +838,7 @@ <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string> <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string> <string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string> - <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Sel. pl. de fundo de..."</string> + <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecionar de..."</string> <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string> <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quando encaixado ou suspenso e carregando"</string> <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos"</string> @@ -998,7 +998,7 @@ <string name="storage_other_users" msgid="808708845102611856">"Outros usuários"</string> <string name="storage_internal_title" msgid="690771193137801021">"Armazenamento do dispositivo"</string> <string name="storage_external_title" msgid="3433462910096848696">"Armazenamento portátil"</string> - <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="USED">%1$s</xliff:g> usado(s) de <xliff:g id="TOTAL">%2$s</xliff:g>"</string> + <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="USED">%1$s</xliff:g> usados de um total de <xliff:g id="TOTAL">%2$s</xliff:g>"</string> <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string> <string name="storage_volume_used" msgid="1303803057698959872">"Usado(s) de <xliff:g id="TOTAL">%1$s</xliff:g>"</string> <string name="storage_volume_used_total" msgid="6113121714019000244">"Total usado de <xliff:g id="TOTAL">%1$s</xliff:g>"</string> @@ -1525,7 +1525,7 @@ <string name="bugreport_in_power_summary" msgid="1778455732762984579">"Mostrar um botão para gerar relatórios de bugs no menu do botão liga/desliga"</string> <string name="keep_screen_on" msgid="1146389631208760344">"Permanecer ativo"</string> <string name="keep_screen_on_summary" msgid="2173114350754293009">"A tela nunca entrará em inatividade enquanto estiver carregando."</string> - <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar log de rastr. Bluetooth HCI"</string> + <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar log de rastreamento Bluetooth HCI"</string> <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI em um arquivo"</string> <string name="oem_unlock_enable" msgid="6040763321967327691">"Desbloqueio de OEM"</string> <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Permitir que o bootloader seja desbloqueado"</string> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 91a74e9..80f8cf2 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -381,8 +381,8 @@ <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nu există un cod PIN sau o parolă pentru blocarea ecranului"</string> <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Trebuie să setați un cod PIN sau o parolă pentru blocarea ecranului înainte de a începe criptarea."</string> <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Criptați?"</string> - <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"Operaţia de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care tableta se va reporni de mai multe ori."</string> - <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"Operaţia de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care telefonul se va reporni de mai multe ori."</string> + <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"Operația de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care tableta se va reporni de mai multe ori."</string> + <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"Operația de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care telefonul se va reporni de mai multe ori."</string> <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Criptare"</string> <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Aşteptaţi criptarea tabletei. Finalizat <xliff:g id="PERCENT">^1</xliff:g>%."</string> <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Aşteptaţi criptarea telefonului. Finalizat <xliff:g id="PERCENT">^1</xliff:g>%."</string> @@ -393,8 +393,8 @@ <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Avertisment: datele de pe dispozitiv vor fi șterse după încă <xliff:g id="COUNT">^1</xliff:g> încercări nereușite de deblocare!"</string> <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduceţi parola"</string> <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Criptare nereușită"</string> - <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea tabletei, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string> - <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea telefonului, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string> + <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea tabletei, trebuie să efectuați o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string> + <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea telefonului, trebuie să efectuați o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string> <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Decriptarea nu a reușit"</string> <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Parola pe care ați introdus-o este corectă, dar, din păcate, datele sunt deteriorate. \n\nPentru a relua utilizarea tabletei, trebuie să reveniți la setările din fabrică. Când vă configurați tableta după resetare, veți putea să restabiliți toate datele care au backup în Contul Google."</string> <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Parola pe care ați introdus-o este corectă, dar, din păcate, datele sunt deteriorate. \n\nPentru a relua utilizarea telefonului, trebuie să reveniți la setările din fabrică. Când vă configurați telefonul după resetare, veți putea să restabiliți toate datele care au backup în Contul Google."</string> @@ -744,7 +744,7 @@ <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Dacă vă deconectați, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> se va încheia."</string> <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Dacă vă deconectați, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> și cu alte <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispozitive se va încheia."</string> <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulați invitaţia?"</string> - <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Doriţi să anulaţi invitaţia de conectare cu <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string> + <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Doriți să anulaţi invitaţia de conectare cu <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string> <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Eliminaţi acest grup?"</string> <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi-Fi portabil"</string> <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi-Fi"</string> @@ -1238,7 +1238,7 @@ <string name="settings_license_activity_loading" msgid="3337535809093591740">"Se încarcă…"</string> <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informații privind siguranța"</string> <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informații privind siguranţa"</string> - <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nu aveţi o conexiune de date. Pentru a vedea aceste informații acum, accesaţi %s de pe orice computer conectat la internet."</string> + <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nu aveți o conexiune de date. Pentru a vedea aceste informații acum, accesați %s de pe orice computer conectat la internet."</string> <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Se încarcă…"</string> <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Alegeți parola"</string> <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Alegeți modelul"</string> @@ -1368,8 +1368,8 @@ <string name="clear_failed_dlg_text" msgid="5464475937929941008">"Nu s-au putut șterge datele aplicației."</string> <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Această aplicație poate accesa pe tabletă următoarele:"</string> <string name="security_settings_desc" product="default" msgid="61749028818785244">"Această aplicație poate accesa următoarele elemente de pe telefonul dvs.:"</string> - <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Această aplicație poate accesa următoarele elemente pe tableta dvs. Pentru a îmbunătăţi performanţa și a reduce consumul de memorie, unele dintre aceste permisiuni sunt disponibile pentru <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, deoarece aceasta rulează în același proces ca și <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string> - <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Această aplicație poate accesa următoarele elemente pe telefonul dvs. Pentru a îmbunătăţi performanţa și a reduce consumul de memorie, unele dintre aceste permisiuni sunt disponibile pentru <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, deoarece aceasta rulează în același proces ca și <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string> + <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Această aplicație poate accesa următoarele elemente pe tableta dvs. Pentru a îmbunătăţi performanța și a reduce consumul de memorie, unele dintre aceste permisiuni sunt disponibile pentru <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, deoarece aceasta rulează în același proces ca și <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string> + <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Această aplicație poate accesa următoarele elemente pe telefonul dvs. Pentru a îmbunătăţi performanța și a reduce consumul de memorie, unele dintre aceste permisiuni sunt disponibile pentru <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, deoarece aceasta rulează în același proces ca și <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string> <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> și <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string> <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> și <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string> <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string> @@ -1378,7 +1378,7 @@ <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Trimiteți SMS premium"</string> <string name="computing_size" msgid="1599186977475211186">"În curs de calculare..."</string> <string name="invalid_size_value" msgid="1582744272718752951">"Nu s-a putut calcula mărimea pachetului."</string> - <string name="empty_list_msg" msgid="3552095537348807772">"Nu aveţi instalată nicio aplicație terţă parte."</string> + <string name="empty_list_msg" msgid="3552095537348807772">"Nu aveți instalată nicio aplicație terţă parte."</string> <string name="version_text" msgid="9189073826278676425">"versiunea <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string> <string name="move_app" msgid="5042838441401731346">"Mutați"</string> <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mutați pe tabletă"</string> @@ -1471,7 +1471,7 @@ <string name="spellchecker_security_warning" msgid="9060897418527708922">"Acest instrument de verificare a ortografiei poate, de asemenea, să culeagă în întregime textul pe care îl introduceţi, inclusiv datele personale, cum ar fi parolele și numerele cardurilor de credit. Instrumentul provine de la aplicația <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utilizaţi acest instrument de verificare ortografică?"</string> <string name="spellchecker_quick_settings" msgid="246728645150092058">"Setări"</string> <string name="spellchecker_language" msgid="6041050114690541437">"Limbă"</string> - <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Deschiderea setărilor pentru <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> a eşuat"</string> + <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Deschiderea setărilor pentru <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> a eșuat"</string> <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string> <string name="pointer_speed" msgid="1221342330217861616">"Viteza indicatorului"</string> <string name="game_controller_settings_category" msgid="8794508575329923718">"Controler de joc"</string> @@ -1609,7 +1609,7 @@ <string name="accessibility_display_title" msgid="7610175687949675162">"Afișaj"</string> <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtitrări"</string> <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesturi pentru mărire"</string> - <string name="accessibility_screen_magnification_summary" msgid="1178289000423776584">"După activarea acestei funcţii, puteţi mări și micşora atingând de trei ori ecranul.\n\nÎn timp ce măriți, puteţi:\n"<ul><li>"să deplasați: deplasați două sau mai multe degete pe ecran;"</li>\n<li>"să ajustați nivelul de zoom: ciupiți cu două sau mai multe degete ori îndepărtați-le."</li></ul>\n\n"De asemenea, puteţi să măriți temporar ce se află sub degetul dvs. atingând ecranul de trei ori și menținând degetul pe ecran. În imaginea mărită, puteţi să glisaţi degetul pentru a explora diferite părți ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară.\n\nNotă: atingerea triplă pentru mărire funcţionează peste tot, cu excepţia tastaturii și a barei de navigare."</string> + <string name="accessibility_screen_magnification_summary" msgid="1178289000423776584">"După activarea acestei funcţii, puteţi mări și micşora atingând de trei ori ecranul.\n\nÎn timp ce măriți, puteţi:\n"<ul><li>"să deplasați: deplasați două sau mai multe degete pe ecran;"</li>\n<li>"să ajustați nivelul de zoom: ciupiți cu două sau mai multe degete ori îndepărtați-le."</li></ul>\n\n"De asemenea, puteţi să măriți temporar ce se află sub degetul dvs. atingând ecranul de trei ori și menținând degetul pe ecran. În imaginea mărită, puteţi să glisaţi degetul pentru a explora diferite părți ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară.\n\nNotă: atingerea triplă pentru mărire funcţionează peste tot, cu excepția tastaturii și a barei de navigare."</string> <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Comandă rapidă de accesibilitate"</string> <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activat"</string> <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Dezactivată"</string> @@ -1979,7 +1979,7 @@ <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> <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"Parola nouă și confirmarea acesteia nu se potrivesc."</string> - <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Setarea parolei de rezervă a eşuat"</string> + <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Setarea parolei de rezervă a eșuat"</string> <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string> <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Doriți să opriți crearea copiei de rezervă pentru parolele Wi-Fi, marcaje, alte setări, datele aplicațiilor și să ștergeți toate copiile aflate pe serverele Google?"</string> <string name="fullbackup_erase_dialog_message" msgid="944399039066318647">"Doriți să nu li se mai facă backup datelor de pe dispozitiv (de exemplu, parolele Wi-Fi și istoricul apelurilor) și datelor din aplicații (de exemplu, setările și fișierele stocate de aplicații) și să ștergeți toate copiile din Google Drive?"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 1f20638..5216355 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -2922,7 +2922,7 @@ <string name="write_settings_off" msgid="5156104383386336233">"Нет"</string> <string name="camera_gesture_title" msgid="1075838577642393011">"Включать камеру движением запястья"</string> <string name="camera_gesture_desc" msgid="1831390075255870960">"Чтобы открыть приложение \"Камера\", дважды поверните запястье."</string> - <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Открывать камеру, дважды нажимая кнопку питания"</string> + <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камера двойным нажатием кнопки питания"</string> <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Быстро открывать камеру, не снимая блокировку экрана."</string> <string-array name="color_mode_names"> <item msgid="2425514299220523812">"Насыщенный (по умолчанию)"</item> diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index f80313b..e9ecf78 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -2842,7 +2842,7 @@ <string name="memory_performance" msgid="5661005192284103281">"කාර්යසාධනය"</string> <string name="total_memory" msgid="2017287600738630165">"මුළු මතකය"</string> <string name="average_used" msgid="5338339266517245782">"සාමාන්ය භාවිතය (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"නිදහස්"</string> + <string name="free_memory" msgid="4003936141603549746">"භාවිතා නොකළ"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"යෙදුම් මඟින් භාවිතා කළ මතකය"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="one">අන්තිම <xliff:g id="DURATION_1">%2$s</xliff:g> තුළ මතකය යෙදුම් <xliff:g id="COUNT">%1$d</xliff:g> ක් භාවිතා කරන ලදි</item> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 9ec5ec4..7e2a1e9 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -2874,7 +2874,7 @@ <string name="memory_performance" msgid="5661005192284103281">"Výkonnosť"</string> <string name="total_memory" msgid="2017287600738630165">"Celková pamäť"</string> <string name="average_used" msgid="5338339266517245782">"Priemerné využitie (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Voľné"</string> + <string name="free_memory" msgid="4003936141603549746">"Voľná pamäť"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Pamäť používaná aplikáciami"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikácie použili pamäť za obdobie: <xliff:g id="DURATION_1">%2$s</xliff:g></item> diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml index 7b055e9..87a7021 100644 --- a/res/values-ta-rIN/strings.xml +++ b/res/values-ta-rIN/strings.xml @@ -2839,8 +2839,8 @@ <string name="sort_max_use" msgid="4629247978290075124">"அதிகபட்ச உபயோகத்தின்படி வரிசைப்படுத்து"</string> <string name="memory_performance" msgid="5661005192284103281">"செயல்திறன்"</string> <string name="total_memory" msgid="2017287600738630165">"மொத்த நினைவகம்"</string> - <string name="average_used" msgid="5338339266517245782">"சராசரி உபயோகம் (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"காலி"</string> + <string name="average_used" msgid="5338339266517245782">"பயன்படுத்தியது (%)"</string> + <string name="free_memory" msgid="4003936141603549746">"இருப்பது"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"பயன்பாடுகள் உபயோகிக்கும் நினைவகம்"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other">கடந்த <xliff:g id="DURATION_1">%2$s</xliff:g> இல் <xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகள் நினைவகத்தைப் பயன்படுத்தியுள்ளன</item> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index b75a04b..56bb1de 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -998,9 +998,9 @@ <string name="storage_other_users" msgid="808708845102611856">"ผู้ใช้รายอื่นๆ"</string> <string name="storage_internal_title" msgid="690771193137801021">"ที่เก็บข้อมูลอุปกรณ์"</string> <string name="storage_external_title" msgid="3433462910096848696">"ที่จัดเก็บข้อมูลแบบพกพา"</string> - <string name="storage_volume_summary" msgid="7023441974367853372">"ใช้ไป <xliff:g id="USED">%1$s</xliff:g> จาก <xliff:g id="TOTAL">%2$s</xliff:g>"</string> + <string name="storage_volume_summary" msgid="7023441974367853372">"ใช้ไป <xliff:g id="USED">%1$s</xliff:g> จากทั้งหมด <xliff:g id="TOTAL">%2$s</xliff:g>"</string> <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string> - <string name="storage_volume_used" msgid="1303803057698959872">"ใช้ไปจาก <xliff:g id="TOTAL">%1$s</xliff:g>"</string> + <string name="storage_volume_used" msgid="1303803057698959872">"ที่ใช้ไปจากทั้งหมด <xliff:g id="TOTAL">%1$s</xliff:g>"</string> <string name="storage_volume_used_total" msgid="6113121714019000244">"ใช้ไปทั้งหมดจาก <xliff:g id="TOTAL">%1$s</xliff:g>"</string> <string name="storage_mount_success" msgid="687641090137253647">"ต่อเชื่อม<xliff:g id="NAME">%1$s</xliff:g>แล้ว"</string> <string name="storage_mount_failure" msgid="1042621107954547316">"ไม่สามารถต่อเชื่อม<xliff:g id="NAME">%1$s</xliff:g>"</string> @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"ประสิทธิภาพ"</string> <string name="total_memory" msgid="2017287600738630165">"หน่วยความจำทั้งหมด"</string> <string name="average_used" msgid="5338339266517245782">"การใช้โดยเฉลี่ย (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"ว่าง"</string> + <string name="free_memory" msgid="4003936141603549746">"เหลือ"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"หน่วยความจำที่แอปใช้"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> แอปใช้หน่วยความจำใน <xliff:g id="DURATION_1">%2$s</xliff:g>ที่ผ่านมา</item> diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml index 7802480..850fd46 100644 --- a/res/values-ur-rPK/strings.xml +++ b/res/values-ur-rPK/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"کارکردگی"</string> <string name="total_memory" msgid="2017287600738630165">"کل میموری"</string> <string name="average_used" msgid="5338339266517245782">"اوسط استعمال (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"آزاد"</string> + <string name="free_memory" msgid="4003936141603549746">"خالی"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"ایپس کی جانب سے استعمال کردہ میموری"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other">گزشتہ <xliff:g id="DURATION_1">%2$s</xliff:g> گھنٹے میں <xliff:g id="COUNT">%1$d</xliff:g> ایپس نے میموری استعمال کی</item> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index b7ec131..2b3de04 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -2840,7 +2840,7 @@ <string name="memory_performance" msgid="5661005192284103281">"Hiệu suất"</string> <string name="total_memory" msgid="2017287600738630165">"Tổng bộ nhớ"</string> <string name="average_used" msgid="5338339266517245782">"Đã sử dụng trung bình (%)"</string> - <string name="free_memory" msgid="4003936141603549746">"Trống"</string> + <string name="free_memory" msgid="4003936141603549746">"Còn trống"</string> <string name="memory_usage_apps" msgid="5650192998273294098">"Bộ nhớ do ứng dụng sử dụng"</string> <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774"> <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ứng dụng đã sử dụng bộ nhớ trong <xliff:g id="DURATION_1">%2$s</xliff:g> qua</item> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 8930832..9524d24 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -1354,7 +1354,7 @@ <string name="app_not_found_dlg_text" msgid="4893589904687340011">"在已安装应用的列表中找不到该应用。"</string> <string name="clear_data_failed" msgid="7214074331627422248">"无法清除应用数据。"</string> <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"要卸载更新吗？"</string> - <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"此Android系统自带应用的所有相关更新都将被卸载。"</string> + <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"此 Android 系统自带应用的所有相关更新都将被卸载。"</string> <string name="clear_failed_dlg_title" msgid="2387060805294783175">"清除数据"</string> <string name="clear_failed_dlg_text" msgid="5464475937929941008">"无法清除应用数据。"</string> <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"此应用拥有以下权限："</string> @@ -1799,7 +1799,7 @@ <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"上次拔下电源 <xliff:g id="UNPLUGGED">%1$s</xliff:g> 时"</string> <string name="menu_stats_total" msgid="8973377864854807854">"总使用量"</string> <string name="menu_stats_refresh" msgid="1676215433344981075">"刷新"</string> - <string name="process_kernel_label" msgid="3916858646836739323">"Android操作系统"</string> + <string name="process_kernel_label" msgid="3916858646836739323">"Android 操作系统"</string> <string name="process_mediaserver_label" msgid="6500382062945689285">"媒体服务器"</string> <string name="process_dex2oat_label" msgid="2592408651060518226">"应用优化"</string> <string name="battery_saver" msgid="1426682272004907982">"节电助手"</string> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 5f8756e..a7b7408 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -998,9 +998,9 @@ <string name="storage_other_users" msgid="808708845102611856">"其他使用者"</string> <string name="storage_internal_title" msgid="690771193137801021">"儲存裝置"</string> <string name="storage_external_title" msgid="3433462910096848696">"外置儲存空間"</string> - <string name="storage_volume_summary" msgid="7023441974367853372">"使用了 <xliff:g id="TOTAL">%2$s</xliff:g> 中的 <xliff:g id="USED">%1$s</xliff:g>"</string> + <string name="storage_volume_summary" msgid="7023441974367853372">"已使用 <xliff:g id="USED">%1$s</xliff:g> (共 <xliff:g id="TOTAL">%2$s</xliff:g>)"</string> <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string> - <string name="storage_volume_used" msgid="1303803057698959872">"<xliff:g id="TOTAL">%1$s</xliff:g> 已使用"</string> + <string name="storage_volume_used" msgid="1303803057698959872">"(共 <xliff:g id="TOTAL">%1$s</xliff:g>)"</string> <string name="storage_volume_used_total" msgid="6113121714019000244">"<xliff:g id="TOTAL">%1$s</xliff:g> 總共已使用"</string> <string name="storage_mount_success" msgid="687641090137253647">"已連接 <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="storage_mount_failure" msgid="1042621107954547316">"無法連接 <xliff:g id="NAME">%1$s</xliff:g>"</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 7897373..c955812 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -1000,7 +1000,7 @@ <string name="storage_external_title" msgid="3433462910096848696">"可攜式儲存空間"</string> <string name="storage_volume_summary" msgid="7023441974367853372">"已使用 <xliff:g id="USED">%1$s</xliff:g> (共 <xliff:g id="TOTAL">%2$s</xliff:g>)"</string> <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string> - <string name="storage_volume_used" msgid="1303803057698959872">"<xliff:g id="TOTAL">%1$s</xliff:g> 總儲存空間使用量"</string> + <string name="storage_volume_used" msgid="1303803057698959872">"(共 <xliff:g id="TOTAL">%1$s</xliff:g>)"</string> <string name="storage_volume_used_total" msgid="6113121714019000244">"儲存空間共計：<xliff:g id="TOTAL">%1$s</xliff:g>"</string> <string name="storage_mount_success" msgid="687641090137253647">"已掛載「<xliff:g id="NAME">%1$s</xliff:g>」"</string> <string name="storage_mount_failure" msgid="1042621107954547316">"無法掛載「<xliff:g id="NAME">%1$s</xliff:g>」"</string> diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java index a95442b..d32a3a4 100644 --- a/src/com/android/settings/ApnSettings.java +++ b/src/com/android/settings/ApnSettings.java @@ -115,6 +115,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements private boolean mUnavailable; private boolean mHideImsApn; + private boolean mAllowAddingApns; private final BroadcastReceiver mMobileStateReceiver = new BroadcastReceiver() { @Override @@ -172,6 +173,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements getSystemService(Context.CARRIER_CONFIG_SERVICE); PersistableBundle b = configManager.getConfig(); mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL); + mAllowAddingApns = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL); } @Override @@ -237,15 +239,15 @@ public class ApnSettings extends SettingsPreferenceFragment implements final String mccmnc = mSubscriptionInfo == null ? "" : tm.getIccOperatorNumericForData(mSubscriptionInfo.getSubscriptionId()); Log.d(TAG, "mccmnc = " + mccmnc); - String where = "numeric=\"" - + mccmnc - + "\" AND NOT (type='ia' AND (apn=\"\" OR apn IS NULL))"; + StringBuilder where = new StringBuilder("numeric=\"" + mccmnc + + "\" AND NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND user_visible!=0"); + if (mHideImsApn) { - where = where + " AND NOT (type='ims')"; + where.append(" AND NOT (type='ims')"); } Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] { - "_id", "name", "apn", "type", "mvno_type", "mvno_match_data", "read_only"}, where, + "_id", "name", "apn", "type", "mvno_type", "mvno_match_data", "read_only"}, where.toString(), null, Telephony.Carriers.DEFAULT_SORT_ORDER); if (cursor != null) { @@ -341,10 +343,12 @@ public class ApnSettings extends SettingsPreferenceFragment implements @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { if (!mUnavailable) { - menu.add(0, MENU_NEW, 0, - getResources().getString(R.string.menu_new)) - .setIcon(R.drawable.ic_menu_add_white) - .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + if (mAllowAddingApns) { + menu.add(0, MENU_NEW, 0, + getResources().getString(R.string.menu_new)) + .setIcon(android.R.drawable.ic_menu_add) + .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + } menu.add(0, MENU_RESTORE, 0, getResources().getString(R.string.menu_restore)) .setIcon(android.R.drawable.ic_menu_upload); diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index d0b916f..ef12628 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -1174,6 +1174,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable mCycleAdapter.clear(); final Context context = mCycleSpinner.getContext(); + NetworkStatsHistory.Entry entry = null; long historyStart = Long.MAX_VALUE; long historyEnd = Long.MIN_VALUE; @@ -1196,9 +1197,20 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable final long cycleStart = computeLastCycleBoundary(cycleEnd, policy); Log.d(TAG, "generating cs=" + cycleStart + " to ce=" + cycleEnd + " waiting for hs=" + historyStart); - mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd)); + + final boolean includeCycle; + if (mChartData != null) { + entry = mChartData.network.getValues(cycleStart, cycleEnd, entry); + includeCycle = (entry.rxBytes + entry.txBytes) > 0; + } else { + includeCycle = true; + } + + if (includeCycle) { + mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd)); + hasCycles = true; + } cycleEnd = cycleStart; - hasCycles = true; } // one last cycle entry to modify policy cycle day @@ -1210,7 +1222,18 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable long cycleEnd = historyEnd; while (cycleEnd > historyStart) { final long cycleStart = cycleEnd - (DateUtils.WEEK_IN_MILLIS * 4); - mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd)); + + final boolean includeCycle; + if (mChartData != null) { + entry = mChartData.network.getValues(cycleStart, cycleEnd, entry); + includeCycle = (entry.rxBytes + entry.txBytes) > 0; + } else { + includeCycle = true; + } + + if (includeCycle) { + mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd)); + } cycleEnd = cycleStart; } diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index b18e27c..6dcbbe5 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -1284,9 +1284,9 @@ public final class Utils { boolean hasPreferred = hasPreferredActivities(pm, packageName) || hasUsbDefaults(usbManager, packageName); int status = pm.getIntentVerificationStatus(packageName, UserHandle.myUserId()); + // consider a visible current link-handling state to be any explicitly designated behavior boolean hasDomainURLsPreference = - (status == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS) || - (status == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER); + status != PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED; return context.getString(hasPreferred || hasDomainURLsPreference ? R.string.launch_defaults_some : R.string.launch_defaults_none); diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index c885b02..6c2f241 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -17,14 +17,16 @@ package com.android.settings.applications; import android.app.AlertDialog; +import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ApplicationInfo; import android.content.pm.IntentFilterVerificationInfo; import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.net.Uri; import android.os.Bundle; import android.os.UserHandle; import android.preference.Preference; -import android.preference.SwitchPreference; import android.util.ArraySet; import android.util.Log; import android.view.View; @@ -52,8 +54,17 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe private static final String KEY_SUPPORTED_DOMAIN_URLS = "app_launch_supported_domain_urls"; private static final String KEY_CLEAR_DEFAULTS = "app_launch_clear_defaults"; + private static final Intent sBrowserIntent; + static { + sBrowserIntent = new Intent() + .setAction(Intent.ACTION_VIEW) + .addCategory(Intent.CATEGORY_BROWSABLE) + .setData(Uri.parse("http:")); + } + private PackageManager mPm; + private boolean mIsBrowser; private boolean mHasDomainUrls; private DropDownPreference mAppLinkState; private AppDomainsPreference mAppDomainUrls; @@ -64,62 +75,91 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.installed_app_launch_settings); + mAppDomainUrls = (AppDomainsPreference) findPreference(KEY_SUPPORTED_DOMAIN_URLS); + mClearDefaultsPreference = (ClearDefaultsPreference) findPreference(KEY_CLEAR_DEFAULTS); + mAppLinkState = (DropDownPreference) findPreference(KEY_APP_LINK_STATE); mPm = getActivity().getPackageManager(); + mIsBrowser = isBrowserApp(mPackageName); mHasDomainUrls = (mAppEntry.info.privateFlags & ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS) != 0; - List<IntentFilterVerificationInfo> iviList = mPm.getIntentFilterVerifications(mPackageName); - - List<IntentFilter> filters = mPm.getAllIntentFilters(mPackageName); - - mAppDomainUrls = (AppDomainsPreference) findPreference(KEY_SUPPORTED_DOMAIN_URLS); - CharSequence[] entries = getEntries(mPackageName, iviList, filters); - mAppDomainUrls.setTitles(entries); - mAppDomainUrls.setValues(new int[entries.length]); - - mClearDefaultsPreference = (ClearDefaultsPreference) findPreference(KEY_CLEAR_DEFAULTS); + if (!mIsBrowser) { + List<IntentFilterVerificationInfo> iviList = mPm.getIntentFilterVerifications(mPackageName); + List<IntentFilter> filters = mPm.getAllIntentFilters(mPackageName); + CharSequence[] entries = getEntries(mPackageName, iviList, filters); + mAppDomainUrls.setTitles(entries); + mAppDomainUrls.setValues(new int[entries.length]); + } buildStateDropDown(); } - private void buildStateDropDown() { - mAppLinkState = (DropDownPreference) findPreference(KEY_APP_LINK_STATE); + // An app is a "browser" if it has an activity resolution that wound up + // marked with the 'handleAllWebDataURI' flag. + private boolean isBrowserApp(String packageName) { + sBrowserIntent.setPackage(packageName); + List<ResolveInfo> list = mPm.queryIntentActivitiesAsUser(sBrowserIntent, + PackageManager.MATCH_ALL, UserHandle.myUserId()); + final int count = list.size(); + for (int i = 0; i < count; i++) { + ResolveInfo info = list.get(i); + if (info.activityInfo != null && info.handleAllWebDataURI) { + return true; + } + } + return false; + } - // Designed order of states in the dropdown: - // - // * always - // * ask - // * never - mAppLinkState.addItem(R.string.app_link_open_always, - INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS); - mAppLinkState.addItem(R.string.app_link_open_ask, - INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK); - mAppLinkState.addItem(R.string.app_link_open_never, - INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER); - - mAppLinkState.setEnabled(mHasDomainUrls); - if (mHasDomainUrls) { - // Present 'undefined' as 'ask' because the OS treats them identically for - // purposes of the UI (and does the right thing around pending domain - // verifications that might arrive after the user chooses 'ask' in this UI). - final int state = mPm.getIntentVerificationStatus(mPackageName, UserHandle.myUserId()); - mAppLinkState.setSelectedValue( - (state == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED) - ? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK - : state); - - // Set the callback only after setting the initial selected item - mAppLinkState.setCallback(new Callback() { - @Override - public boolean onItemSelected(int pos, Object value) { - return updateAppLinkState((Integer) value); - } - }); + private void buildStateDropDown() { + if (mIsBrowser) { + // Browsers don't show the app-link prefs + mAppLinkState.setShouldDisableView(true); + mAppLinkState.setEnabled(false); + mAppDomainUrls.setShouldDisableView(true); + mAppDomainUrls.setEnabled(false); + } else { + // Designed order of states in the dropdown: + // + // * always + // * ask + // * never + mAppLinkState.addItem(R.string.app_link_open_always, + INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS); + mAppLinkState.addItem(R.string.app_link_open_ask, + INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK); + mAppLinkState.addItem(R.string.app_link_open_never, + INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER); + + mAppLinkState.setEnabled(mHasDomainUrls); + if (mHasDomainUrls) { + // Present 'undefined' as 'ask' because the OS treats them identically for + // purposes of the UI (and does the right thing around pending domain + // verifications that might arrive after the user chooses 'ask' in this UI). + final int state = mPm.getIntentVerificationStatus(mPackageName, UserHandle.myUserId()); + mAppLinkState.setSelectedValue( + (state == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED) + ? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK + : state); + + // Set the callback only after setting the initial selected item + mAppLinkState.setCallback(new Callback() { + @Override + public boolean onItemSelected(int pos, Object value) { + return updateAppLinkState((Integer) value); + } + }); + } } } private boolean updateAppLinkState(final int newState) { + if (mIsBrowser) { + // We shouldn't get into this state, but if we do make sure + // not to cause any permanent mayhem. + return false; + } + final int userId = UserHandle.myUserId(); final int priorState = mPm.getIntentVerificationStatus(mPackageName, userId); diff --git a/src/com/android/settings/applications/ClearDefaultsPreference.java b/src/com/android/settings/applications/ClearDefaultsPreference.java index 8be4be0..bcb6a8a 100644 --- a/src/com/android/settings/applications/ClearDefaultsPreference.java +++ b/src/com/android/settings/applications/ClearDefaultsPreference.java @@ -93,9 +93,13 @@ public class ClearDefaultsPreference extends Preference { @Override public void onClick(View v) { if (mUsbManager != null) { + final int userId = UserHandle.myUserId(); mPm.clearPackagePreferredActivities(mPackageName); + if (isDefaultBrowser(mPackageName)) { + mPm.setDefaultBrowserPackageName(null, userId); + } try { - mUsbManager.clearDefaults(mPackageName, UserHandle.myUserId()); + mUsbManager.clearDefaults(mPackageName, userId); } catch (RemoteException e) { Log.e(TAG, "mUsbManager.clearDefaults", e); } @@ -122,6 +126,7 @@ public class ClearDefaultsPreference extends Preference { TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch); boolean autoLaunchEnabled = Utils.hasPreferredActivities(mPm, mPackageName) + || isDefaultBrowser(mPackageName) || Utils.hasUsbDefaults(mUsbManager, mPackageName); if (!autoLaunchEnabled && !hasBindAppWidgetPermission) { resetLaunchDefaultsUi(autoLaunchView); @@ -165,6 +170,11 @@ public class ClearDefaultsPreference extends Preference { return true; } + private boolean isDefaultBrowser(String packageName) { + final String defaultBrowser = mPm.getDefaultBrowserPackageName(UserHandle.myUserId()); + return packageName.equals(defaultBrowser); + } + private void resetLaunchDefaultsUi(TextView autoLaunchView) { autoLaunchView.setText(R.string.auto_launch_disable_text); // Disable clear activities button diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index b5e24e5..c866d29 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -755,6 +755,10 @@ public class InstalledAppDetails extends AppInfoBase * @see android.view.View.OnClickListener#onClick(android.view.View) */ public void onClick(View v) { + if (mAppEntry == null) { + setIntentAndFinish(true, true); + return; + } String packageName = mAppEntry.info.packageName; if(v == mUninstallButton) { if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { @@ -1018,7 +1022,6 @@ public class InstalledAppDetails extends AppInfoBase mPermissionReceiver = null; final Resources res = getResources(); CharSequence summary = null; - boolean enabled = false; if (counts != null) { int totalCount = counts[1]; int additionalCounts = counts[2]; @@ -1027,8 +1030,6 @@ public class InstalledAppDetails extends AppInfoBase summary = res.getString( R.string.runtime_permissions_summary_no_permissions_requested); } else { - enabled = true; - final ArrayList<CharSequence> list = new ArrayList(Arrays.asList(groupLabels)); if (additionalCounts > 0) { // N additional permissions. @@ -1045,7 +1046,6 @@ public class InstalledAppDetails extends AppInfoBase } } mPermissionsPreference.setSummary(summary); - mPermissionsPreference.setEnabled(enabled); } }; } diff --git a/src/com/android/settings/applications/ProcStatsData.java b/src/com/android/settings/applications/ProcStatsData.java index 5dba409..0cd80e7 100644 --- a/src/com/android/settings/applications/ProcStatsData.java +++ b/src/com/android/settings/applications/ProcStatsData.java @@ -157,6 +157,9 @@ public class ProcStatsData { ProcessStats.ALL_SCREEN_ADJ, mMemStates, ProcessStats.NON_CACHED_PROC_STATES); createPkgMap(getProcs(bgTotals, runTotals), bgTotals, runTotals); + if (totalMem.sysMemZRamWeight > 0) { + distributeZRam(totalMem.sysMemZRamWeight); + } ProcStatsPackageEntry osPkg = createOsEntry(bgTotals, runTotals, totalMem, mMemInfo.baseCacheRam); @@ -180,6 +183,45 @@ public class ProcStatsData { } } + private void distributeZRam(double zramWeight) { + // Distribute kernel's Z-Ram across processes, based on how much they have been running. + // The idea is that the memory used by the kernel for this is not really the kernel's + // responsibility, but that of whoever got swapped in to it... and we will take how + // much a process runs for as a sign of the proportion of Z-Ram it is responsible for. + + long zramMem = (long) (zramWeight / memTotalTime); + long totalTime = 0; + for (int i = pkgEntries.size() - 1; i >= 0; i--) { + ProcStatsPackageEntry entry = pkgEntries.get(i); + for (int j = entry.mEntries.size() - 1; j >= 0; j--) { + ProcStatsEntry proc = entry.mEntries.get(j); + totalTime += proc.mRunDuration; + } + } + for (int i = pkgEntries.size() - 1; i >= 0 && totalTime > 0; i--) { + ProcStatsPackageEntry entry = pkgEntries.get(i); + long pkgRunTime = 0; + long maxRunTime = 0; + for (int j = entry.mEntries.size() - 1; j >= 0; j--) { + ProcStatsEntry proc = entry.mEntries.get(j); + pkgRunTime += proc.mRunDuration; + if (proc.mRunDuration > maxRunTime) { + maxRunTime = proc.mRunDuration; + } + } + long pkgZRam = (zramMem*pkgRunTime)/totalTime; + if (pkgZRam > 0) { + zramMem -= pkgZRam; + totalTime -= pkgRunTime; + ProcStatsEntry procEntry = new ProcStatsEntry(entry.mPackage, 0, + mContext.getString(R.string.process_stats_os_zram), maxRunTime, + pkgZRam, memTotalTime); + procEntry.evaluateTargetPackage(mPm, mStats, null, null, sEntryCompare, mUseUss); + entry.addEntry(procEntry); + } + } + } + private ProcStatsPackageEntry createOsEntry(ProcessDataCollection bgTotals, ProcessDataCollection runTotals, TotalMemoryUseCollection totalMem, long baseCacheRam) { // Add in fake entry representing the OS itself. @@ -188,17 +230,18 @@ public class ProcStatsData { if (totalMem.sysMemNativeWeight > 0) { osEntry = new ProcStatsEntry(Utils.OS_PKG, 0, mContext.getString(R.string.process_stats_os_native), memTotalTime, - (long) (totalMem.sysMemNativeWeight / memTotalTime)); + (long) (totalMem.sysMemNativeWeight / memTotalTime), memTotalTime); osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss); osPkg.addEntry(osEntry); } if (totalMem.sysMemKernelWeight > 0) { osEntry = new ProcStatsEntry(Utils.OS_PKG, 0, mContext.getString(R.string.process_stats_os_kernel), memTotalTime, - (long) (totalMem.sysMemKernelWeight / memTotalTime)); + (long) (totalMem.sysMemKernelWeight / memTotalTime), memTotalTime); osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss); osPkg.addEntry(osEntry); } + /* Turned off now -- zram is being distributed across running apps. if (totalMem.sysMemZRamWeight > 0) { osEntry = new ProcStatsEntry(Utils.OS_PKG, 0, mContext.getString(R.string.process_stats_os_zram), memTotalTime, @@ -206,10 +249,11 @@ public class ProcStatsData { osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss); osPkg.addEntry(osEntry); } + */ if (baseCacheRam > 0) { osEntry = new ProcStatsEntry(Utils.OS_PKG, 0, mContext.getString(R.string.process_stats_os_cache), memTotalTime, - baseCacheRam / 1024); + baseCacheRam / 1024, memTotalTime); osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss); osPkg.addEntry(osEntry); } diff --git a/src/com/android/settings/applications/ProcStatsEntry.java b/src/com/android/settings/applications/ProcStatsEntry.java index 637003c..97a73c4 100644 --- a/src/com/android/settings/applications/ProcStatsEntry.java +++ b/src/com/android/settings/applications/ProcStatsEntry.java @@ -72,13 +72,14 @@ public final class ProcStatsEntry implements Parcelable { + " avgpss=" + mAvgBgMem + " weight=" + mBgWeight); } - public ProcStatsEntry(String pkgName, int uid, String procName, long duration, long mem) { + public ProcStatsEntry(String pkgName, int uid, String procName, long duration, long mem, + long memDuration) { mPackage = pkgName; mUid = uid; mName = procName; mBgDuration = mRunDuration = duration; mAvgBgMem = mMaxBgMem = mAvgRunMem = mMaxRunMem = mem; - mBgWeight = mRunWeight = ((double)duration) * mem; + mBgWeight = mRunWeight = ((double)memDuration) * mem; if (DEBUG) Log.d(TAG, "New proc entry " + procName + ": dur=" + mBgDuration + " avgpss=" + mAvgBgMem + " weight=" + mBgWeight); } diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java index 71d6364..3b2a81e 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java @@ -65,8 +65,10 @@ public final class BluetoothPairingRequest extends BroadcastReceiver { PowerManager powerManager = (PowerManager)context.getSystemService(Context.POWER_SERVICE); String deviceAddress = device != null ? device.getAddress() : null; - if (powerManager.isScreenOn() && - LocalBluetoothPreferences.shouldShowDialogInForeground(context, deviceAddress)) { + String deviceName = device != null ? device.getName() : null; + boolean shouldShowDialog= LocalBluetoothPreferences.shouldShowDialogInForeground( + context, deviceAddress, deviceName); + if (powerManager.isInteractive() && shouldShowDialog) { // Since the screen is on and the BT-related activity is in the foreground, // just open the dialog context.startActivity(pairingIntent); diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java index 074e0bd..fc6b876 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java @@ -107,6 +107,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_CLASS_NAME, mReturnClass); String deviceAddress = mDevice != null ? mDevice.getAddress() : null; + String deviceName = mDevice != null ? mDevice.getName() : null; String title = null; String message = null; PowerManager powerManager = @@ -114,7 +115,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { if (powerManager.isScreenOn() && LocalBluetoothPreferences.shouldShowDialogInForeground( - context, deviceAddress)) { + context, deviceAddress, deviceName)) { context.startActivity(connectionAccessIntent); } else { // Acquire wakelock so that LCD comes up since screen is off @@ -134,27 +135,27 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT, BluetoothDevice.CONNECTION_ACCESS_NO); deleteIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType); - String deviceName = mDevice != null ? mDevice.getAliasName() : null; + String deviceAlias = mDevice != null ? mDevice.getAliasName() : null; switch (mRequestType) { case BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS: title = context.getString(R.string.bluetooth_phonebook_request); message = context.getString(R.string.bluetooth_pb_acceptance_dialog_text, - deviceName, deviceName); + deviceAlias, deviceAlias); break; case BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS: title = context.getString(R.string.bluetooth_map_request); message = context.getString(R.string.bluetooth_map_acceptance_dialog_text, - deviceName, deviceName); + deviceAlias, deviceAlias); break; case BluetoothDevice.REQUEST_TYPE_SIM_ACCESS: title = context.getString(R.string.bluetooth_sap_request); message = context.getString(R.string.bluetooth_sap_acceptance_dialog_text, - deviceName, deviceName); + deviceAlias, deviceAlias); break; default: title = context.getString(R.string.bluetooth_connection_permission_request); message = context.getString(R.string.bluetooth_connection_dialog_text, - deviceName, deviceName); + deviceAlias, deviceAlias); break; } Notification notification = new Notification.Builder(context) diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java index 9f2553f..401b13c 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java @@ -20,6 +20,7 @@ import android.app.QueuedWork; import android.content.Context; import android.content.SharedPreferences; import android.content.res.Configuration; +import android.text.TextUtils; import android.util.Log; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; @@ -62,10 +63,10 @@ final class LocalBluetoothPreferences { } static boolean shouldShowDialogInForeground(Context context, - String deviceAddress) { + String deviceAddress, String deviceName) { LocalBluetoothManager manager = Utils.getLocalBtManager(context); if (manager == null) { - if(DEBUG) Log.v(TAG, "manager == null - do not show dialog."); + if (DEBUG) Log.v(TAG, "manager == null - do not show dialog."); return false; } @@ -115,6 +116,18 @@ final class LocalBluetoothPreferences { } } } + + + if (!TextUtils.isEmpty(deviceName)) { + // If the device is a custom BT keyboard specifically for this device + String packagedKeyboardName = context.getString( + com.android.internal.R.string.config_packagedKeyboardName); + if (deviceName.equals(packagedKeyboardName)) { + if (DEBUG) Log.v(TAG, "showing dialog for packaged keyboard"); + return true; + } + } + if (DEBUG) Log.v(TAG, "Found no reason to show the dialog - do not show dialog."); return false; } diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java index 87d937d..079639b 100644 --- a/src/com/android/settings/deviceinfo/Status.java +++ b/src/com/android/settings/deviceinfo/Status.java @@ -207,8 +207,10 @@ public class Status extends InstrumentedPreferenceActivity { removePreferenceFromScreen(KEY_SERIAL_NUMBER); } - //Remove SimStatus and Imei for Secondary user as it access Phone b/19165700 - if (UserHandle.myUserId() != UserHandle.USER_OWNER) { + // Remove SimStatus and Imei for Secondary user as it access Phone b/19165700 + // Also remove on Wi-Fi only devices. + if (UserHandle.myUserId() != UserHandle.USER_OWNER + || Utils.isWifiOnly(this)) { removePreferenceFromScreen(KEY_SIM_STATUS); removePreferenceFromScreen(KEY_IMEI_INFO); } diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java index 6f89ff5..6f73ecd 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java @@ -137,6 +137,10 @@ public class StorageWizardFormatProgress extends StorageWizardBase { @Override protected void onPostExecute(Exception e) { final StorageWizardFormatProgress activity = mActivity; + if (activity.isDestroyed()) { + return; + } + if (e != null) { Log.e(TAG, "Failed to partition", e); Toast.makeText(activity, e.getMessage(), Toast.LENGTH_LONG).show(); diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java index 2901673..587f41c 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java +++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java @@ -56,7 +56,10 @@ public class UserDictionaryAddWordActivity extends Activity { // The following will get the EXTRA_WORD and EXTRA_LOCALE fields that are in the intent. // We do need to add the action by hand, because UserDictionaryAddWordContents expects // it to be in the bundle, in the EXTRA_MODE key. - final Bundle args = intent.getExtras(); + Bundle args = intent.getExtras(); + if (args == null) { + args = new Bundle(); + } args.putInt(UserDictionaryAddWordContents.EXTRA_MODE, mode); if (null != savedInstanceState) { @@ -74,6 +77,7 @@ public class UserDictionaryAddWordActivity extends Activity { private void reportBackToCaller(final int resultCode, final Bundle result) { final Intent senderIntent = getIntent(); + if (senderIntent.getExtras() == null) return; final Object listener = senderIntent.getExtras().get("listener"); if (!(listener instanceof Messenger)) return; // This will work if listener is null too. final Messenger messenger = (Messenger)listener; diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java index 12bb6ef..e11f564 100644 --- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java +++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java @@ -233,7 +233,8 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme private void handlePackageAvailable(String packageName) { if (!mAccessibilityServices.contains(packageName)) { final Intent intent = getAccessibilityServiceIntent(packageName); - if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) { + List<?> services = mContext.getPackageManager().queryIntentServices(intent, 0); + if (services != null && !services.isEmpty()) { mAccessibilityServices.add(packageName); Index.getInstance(mContext).updateFromClassNameResource( AccessibilitySettings.class.getName(), false, true); @@ -243,7 +244,8 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme if (mHasFeaturePrinting) { if (!mPrintServices.contains(packageName)) { final Intent intent = getPrintServiceIntent(packageName); - if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) { + List<?> services = mContext.getPackageManager().queryIntentServices(intent, 0); + if (services != null && !services.isEmpty()) { mPrintServices.add(packageName); Index.getInstance(mContext).updateFromClassNameResource( PrintSettingsFragment.class.getName(), false, true); @@ -254,7 +256,8 @@ public final class DynamicIndexableContentMonitor extends PackageMonitor impleme if (mHasFeatureIme) { if (!mImeServices.contains(packageName)) { Intent intent = getIMEServiceIntent(packageName); - if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) { + List<?> services = mContext.getPackageManager().queryIntentServices(intent, 0); + if (services != null && !services.isEmpty()) { mImeServices.add(packageName); Index.getInstance(mContext).updateFromClassNameResource( InputMethodAndLanguageSettings.class.getName(), false, true); diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java index 80f9fcd..a6189a9 100644 --- a/src/com/android/settings/vpn2/ConfigDialogFragment.java +++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java @@ -16,6 +16,8 @@ package com.android.settings.vpn2; +import java.util.Arrays; + import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -123,7 +125,18 @@ public class ConfigDialogFragment extends DialogFragment implements disconnect(profile); // Delete from KeyStore - KeyStore.getInstance().delete(Credentials.VPN + profile.key, KeyStore.UID_SELF); + KeyStore keyStore = KeyStore.getInstance(); + keyStore.delete(Credentials.VPN + profile.key, KeyStore.UID_SELF); + + // If this was the current lockdown VPN, clear it. + if (Arrays.equals(profile.key.getBytes(), keyStore.get(Credentials.LOCKDOWN_VPN))) { + keyStore.delete(Credentials.LOCKDOWN_VPN); + try { + mService.updateLockdownVpn(); + } catch (RemoteException e) { + Log.e(TAG, "Failed to clear lockdown VPN configuration"); + } + } } dismiss(); } diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java index cc9acd6..6fb805b 100644 --- a/src/com/android/settings/widget/ChartDataUsageView.java +++ b/src/com/android/settings/widget/ChartDataUsageView.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.res.Resources; import android.net.NetworkPolicy; import android.net.NetworkStatsHistory; +import android.net.TrafficStats; import android.os.Handler; import android.os.Message; import android.text.Spannable; @@ -33,6 +34,7 @@ import android.text.format.Formatter.BytesResult; import android.text.format.Time; import android.util.AttributeSet; import android.util.Log; +import android.util.MathUtils; import android.view.MotionEvent; import android.view.View; @@ -535,6 +537,7 @@ public class ChartDataUsageView extends ChartView { @Override public long buildLabel(Resources res, SpannableStringBuilder builder, long value) { + value = MathUtils.constrain(value, 0, TrafficStats.TB_IN_BYTES); final BytesResult result = Formatter.formatBytes(res, value, Formatter.FLAG_SHORTER | Formatter.FLAG_CALCULATE_ROUNDED); setText(builder, sSpanSize, result.value, "^1"); |