Merge commit '937ede14d84c2093f831ff8adab96dca207ad742' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master
Change-Id: I91ee596e3800726445cfff5dd784bae9dfdad3ee
Merged-In: I91c48c73287a271bd6c99e60e216dead22e68764
diff --git a/res/layout/private_dns_mode_dialog.xml b/res/layout/private_dns_mode_dialog.xml
new file mode 100644
index 0000000..4347055
--- /dev/null
+++ b/res/layout/private_dns_mode_dialog.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<RadioGroup
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="8dip">
+
+ <RadioButton
+ android:id="@+id/private_dns_mode_off"
+ android:text="@string/private_dns_mode_off"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dip"
+ />
+
+ <RadioButton
+ android:id="@+id/private_dns_mode_opportunistic"
+ android:text="@string/private_dns_mode_opportunistic"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dip"
+ />
+
+ <RadioButton
+ android:id="@+id/private_dns_mode_provider"
+ android:text="@string/private_dns_mode_provider"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dip"
+ />
+
+ <EditText
+ android:id="@+id/private_dns_mode_provider_hostname"
+ android:hint="@string/private_dns_mode_provider_hostname_hint"
+ style="@android:style/Widget.CompoundButton.RadioButton"
+ android:imeOptions="actionDone"
+ android:inputType="textFilter|textUri"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dip"
+ android:layout_marginEnd="8dip"
+ />
+
+</RadioGroup>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 2887ff6..d8029fa 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -33,7 +33,7 @@
<item msgid="3342301044271143016">"١٥ ثانية"</item>
<item msgid="8881760709354815449">"۳۰ ثانية"</item>
<item msgid="7589406073232279088">"دقيقة واحدة"</item>
- <item msgid="7001195990902244174">"۲ دقائق"</item>
+ <item msgid="7001195990902244174">"دقيقتان"</item>
<item msgid="7489864775127957179">"٥ دقائق"</item>
<item msgid="2314124409517439288">"۱۰ دقائق"</item>
<item msgid="6864027152847611413">"۳۰ دقيقة"</item>
@@ -61,7 +61,7 @@
</string-array>
<string-array name="entries_font_size">
<item msgid="8166647333858618801">"صغير"</item>
- <item msgid="6986443533756848935">"الإعداد الافتراضي"</item>
+ <item msgid="6986443533756848935">"الإعداد التلقائي"</item>
<item msgid="38373998008112077">"كبير"</item>
<item msgid="7635254317531872272">"الأكبر"</item>
</string-array>
@@ -219,7 +219,7 @@
<item msgid="7471182818083460781">"IS95A"</item>
</string-array>
<string-array name="mvno_type_entries">
- <item msgid="4367119357633573465">"None"</item>
+ <item msgid="4367119357633573465">"بدون"</item>
<item msgid="6062567900587138000">"SPN"</item>
<item msgid="2454085083342423481">"IMSI"</item>
<item msgid="2681427309183221543">"GID"</item>
@@ -376,7 +376,7 @@
<item msgid="2372711992605524591">"طويلة"</item>
</string-array>
<string-array name="captioning_typeface_selector_titles">
- <item msgid="1319652728542138112">"افتراضي"</item>
+ <item msgid="1319652728542138112">"تلقائي"</item>
<item msgid="1016452621833735880">"Sans-serif"</item>
<item msgid="2496277987934654454">"Sans-serif مكثف"</item>
<item msgid="7247838127505318669">"Sans-serif monospace"</item>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 40d14ba..b47a8a1 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -476,6 +476,6 @@
<string-array name="automatic_storage_management_days">
<item msgid="687318592238852312">"На повече от 30 дни"</item>
<item msgid="2900554746706302178">"На повече от 60 дни"</item>
- <item msgid="5692284879054004388">"На повече от 90 дни"</item>
+ <item msgid="5692284879054004388">"По-стари от 90 дни"</item>
</string-array>
</resources>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index cca163c..46f8502 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -69,7 +69,7 @@
<item msgid="1922181315419294640"></item>
<item msgid="8934131797783724664">"স্ক্যান করা হচ্ছে…"</item>
<item msgid="8513729475867537913">"সংযুক্ত হচ্ছে..."</item>
- <item msgid="515055375277271756">"প্রমাণীকরণ হচ্ছে..."</item>
+ <item msgid="515055375277271756">"যাচাইকরণ হচ্ছে..."</item>
<item msgid="1943354004029184381">"IP ঠিকানা প্রাপ্ত করা হচ্ছে..."</item>
<item msgid="4221763391123233270">"সংযুক্ত হয়েছে"</item>
<item msgid="624838831631122137">"স্থগিত করা হয়েছে"</item>
@@ -83,7 +83,7 @@
<item msgid="7714855332363650812"></item>
<item msgid="8878186979715711006">"স্ক্যান করা হচ্ছে…"</item>
<item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> এর সাথে সংযুক্ত হচ্ছে…"</item>
- <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> দিয়ে প্রমাণীকরণ করা হচ্ছে..."</item>
+ <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> দিয়ে যাচাইকরণ করা হচ্ছে..."</item>
<item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> থেকে IP ঠিকানা জানা হচ্ছে…"</item>
<item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> তে সংযুক্ত হয়েছে"</item>
<item msgid="1330262655415760617">"স্থগিত করা হয়েছে"</item>
@@ -122,7 +122,7 @@
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"পুশ বোতাম"</item>
- <item msgid="1624323946324499595">"যুক্ত করা ডিভাইস থেকে পিন"</item>
+ <item msgid="1624323946324499595">"চেনা ডিভাইস থেকে পিন"</item>
<item msgid="5366790421523328066">"এই ডিভাইস থেকে পিন"</item>
</string-array>
<string-array name="wifi_p2p_status">
@@ -225,14 +225,14 @@
<item msgid="2681427309183221543">"GID"</item>
</string-array>
<string-array name="app_install_location_entries">
- <item msgid="8151497958991952759">"অভ্যন্তরীণ ডিভাইসের সঞ্চয়স্থান"</item>
+ <item msgid="8151497958991952759">"ইন্টারনাল ডিভাইসের স্টোরেজ"</item>
<item msgid="3738430123799803530">"অপসারণযোগ্য SD কার্ড"</item>
<item msgid="4498124044785815005">"সিস্টেমকে সিদ্ধান্ত নিতে দিন"</item>
</string-array>
<string-array name="app_ops_categories">
<item msgid="6358963769537892925">"অবস্থান"</item>
<item msgid="255608127647030286">"ব্যক্তিগত"</item>
- <item msgid="4588829735729884491">"বার্তাপ্রেরণ"</item>
+ <item msgid="4588829735729884491">"মেসেজিং"</item>
<item msgid="886742181977884584">"মাধ্যম"</item>
<item msgid="7924928667052300589">"ডিভাইস"</item>
</string-array>
@@ -240,7 +240,7 @@
<item msgid="4979188868761515915">"অনির্দিষ্ট অবস্থান"</item>
<item msgid="5789673140227507995">"সূক্ষ্ম অবস্থান"</item>
<item msgid="1061584358377390581">"GPS"</item>
- <item msgid="5387405117297558954">"কম্পন"</item>
+ <item msgid="5387405117297558954">"ভাইব্রেট"</item>
<item msgid="3434165993711230924">"পরিচিতিগুলি পড়ুন"</item>
<item msgid="616161687718081936">"পরিচিতি পরিবর্তন করুন"</item>
<item msgid="7638002295329050091">"কল লগ পড়ুন"</item>
@@ -287,7 +287,7 @@
<item msgid="485564189219029300">"VPN সক্রিয় করুন"</item>
<item msgid="7155384795265164395">"ওয়ালপেপারে লিখুন"</item>
<item msgid="1835836196806147034">"পরিকাঠামোর সহায়তা"</item>
- <item msgid="5989890403088155055">"স্ক্রীনশটে সহায়তা"</item>
+ <item msgid="5989890403088155055">"স্ক্রিনশটে সহায়তা"</item>
<item msgid="8582699692765917557">"ফোনে্র অবস্থা পড়ুন"</item>
<item msgid="1474039653814954902">"ভয়েসমেল যোগ করুন"</item>
<item msgid="7222837656938871633">"SIP ব্যবহার করুন"</item>
@@ -307,7 +307,7 @@
<item msgid="6602854600289714121">"অবস্থান"</item>
<item msgid="8677040780775113033">"অবস্থান"</item>
<item msgid="1660743989948992916">"অবস্থান"</item>
- <item msgid="8791172739860195290">"কম্পন"</item>
+ <item msgid="8791172739860195290">"ভাইব্রেট"</item>
<item msgid="383413555642128046">"পরিচিতিগুলি পড়ুন"</item>
<item msgid="3654594895269697313">"পরিচিতি পরিবর্তন করুন"</item>
<item msgid="7928393476362362538">"কল লগ পড়ুন"</item>
@@ -335,7 +335,7 @@
<item msgid="3493046322001257041">"অডিও প্লে করুন"</item>
<item msgid="136815868796597058">"ক্লিপবোর্ড পড়ুন"</item>
<item msgid="5238692940326972503">"ক্লিপবোর্ড সংশোধন করুন"</item>
- <item msgid="5753789168376302997">"মিডিয়া বোতাম"</item>
+ <item msgid="5753789168376302997">"মিডিয়া বোতামগুলি"</item>
<item msgid="3265262911688671938">"অডিও ফোকাস"</item>
<item msgid="2098976479485046797">"মাস্টার ভলিউম"</item>
<item msgid="5660213838861789350">"ভয়েস ভলিউম"</item>
@@ -354,7 +354,7 @@
<item msgid="2482631530338029480">"VPN সক্রিয় করুন"</item>
<item msgid="1662979573471871926">"ওয়ালপেপারে লিখুন"</item>
<item msgid="5964768335278263478">"পরিকাঠামোর সহায়তা"</item>
- <item msgid="2657138701132782702">"স্ক্রীনশটে সহায়তা"</item>
+ <item msgid="2657138701132782702">"স্ক্রিনশটে সহায়তা"</item>
<item msgid="8571369610363539266">"ফোনের অবস্থা পড়ুন"</item>
<item msgid="4542463358215230845">"ভয়েসমেল যোগ করুন"</item>
<item msgid="864565065016166003">"SIP ব্যবহার করুন"</item>
@@ -468,8 +468,8 @@
<string-array name="color_picker">
<item msgid="7631642672260600032">"টিল"</item>
<item msgid="8332294763632946560">"নীল"</item>
- <item msgid="2023216417616991392">"বেগুনি নীলবর্ণ"</item>
- <item msgid="3170497246594232819">"বেগুনি"</item>
+ <item msgid="2023216417616991392">"বেগুনী নীলবর্ণ"</item>
+ <item msgid="3170497246594232819">"বেগুনী"</item>
<item msgid="4608643045752965568">"গোলাপী"</item>
<item msgid="6131821495505931173">"লাল"</item>
</string-array>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index c54b814..284232a 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -413,7 +413,7 @@
<item msgid="758587126802411846">"Sort på hvidt"</item>
<item msgid="1495307195241623402">"Gult på sort"</item>
<item msgid="6039700130994371612">"Gult på blåt"</item>
- <item msgid="7169235156349580064">"Brugerdefineret"</item>
+ <item msgid="7169235156349580064">"Tilpasset"</item>
</string-array>
<string-array name="vpn_types_long">
<item msgid="2732002039459078847">"PPTP-VPN"</item>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index fdba453..9256c39 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -240,7 +240,7 @@
<item msgid="4979188868761515915">"üldine asukoht"</item>
<item msgid="5789673140227507995">"täpne asukoht"</item>
<item msgid="1061584358377390581">"GPS"</item>
- <item msgid="5387405117297558954">"vibratsioon"</item>
+ <item msgid="5387405117297558954">"vibreerimine"</item>
<item msgid="3434165993711230924">"kontaktide lugemine"</item>
<item msgid="616161687718081936">"kontaktide muutmine"</item>
<item msgid="7638002295329050091">"kõnelogi lugemine"</item>
@@ -307,7 +307,7 @@
<item msgid="6602854600289714121">"Asukoht"</item>
<item msgid="8677040780775113033">"Asukoht"</item>
<item msgid="1660743989948992916">"Asukoht"</item>
- <item msgid="8791172739860195290">"Vibratsioon"</item>
+ <item msgid="8791172739860195290">"Vibreerimine"</item>
<item msgid="383413555642128046">"Kontaktide lugemine"</item>
<item msgid="3654594895269697313">"Kontaktide muutmine"</item>
<item msgid="7928393476362362538">"Kõnelogi lugemine"</item>
@@ -341,7 +341,7 @@
<item msgid="5660213838861789350">"Hääle helitugevus"</item>
<item msgid="7983336752371254444">"Helina helitugevus"</item>
<item msgid="7878027809189330917">"Meedia helitugevus"</item>
- <item msgid="7260546305036218513">"Alarmi helitugevus"</item>
+ <item msgid="7260546305036218513">"Äratuse helitugevus"</item>
<item msgid="9103719301075748925">"Märguande helitugevus"</item>
<item msgid="7025966722295861512">"Bluetoothi helitugevus"</item>
<item msgid="4665183401128289653">"Hoia ärkvel"</item>
@@ -476,6 +476,6 @@
<string-array name="automatic_storage_management_days">
<item msgid="687318592238852312">"Üle 30 päeva vana"</item>
<item msgid="2900554746706302178">"Üle 60 päeva vana"</item>
- <item msgid="5692284879054004388">"Üle 90 päeva vana"</item>
+ <item msgid="5692284879054004388">"Üle 90 päeva vanad"</item>
</string-array>
</resources>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 99d2d5a..ad43c34 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -67,7 +67,7 @@
</string-array>
<string-array name="wifi_status">
<item msgid="1922181315419294640"></item>
- <item msgid="8934131797783724664">"Buscando..."</item>
+ <item msgid="8934131797783724664">"Explorando..."</item>
<item msgid="8513729475867537913">"Conectando..."</item>
<item msgid="515055375277271756">"Autenticando…"</item>
<item msgid="1943354004029184381">"Obtendo enderezo IP..."</item>
@@ -81,7 +81,7 @@
</string-array>
<string-array name="wifi_status_with_ssid">
<item msgid="7714855332363650812"></item>
- <item msgid="8878186979715711006">"Buscando..."</item>
+ <item msgid="8878186979715711006">"Explorando..."</item>
<item msgid="355508996603873860">"Conectando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
<item msgid="554971459996405634">"Autenticando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
<item msgid="7928343808033020343">"Obtendo enderezo IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
@@ -254,7 +254,7 @@
<item msgid="8181415497109310680">"ler SMS"</item>
<item msgid="6816551144382117307">"escribir SMS"</item>
<item msgid="4600463921908905030">"recibir SMS"</item>
- <item msgid="5958926493289432745">"recibir SMS de emerxencia"</item>
+ <item msgid="5958926493289432745">"recibir SMS de urxencia"</item>
<item msgid="4945269495221089540">"recibir MMS"</item>
<item msgid="5570472453573929087">"recibir WAP push"</item>
<item msgid="7125408150230860501">"enviar SMS"</item>
@@ -272,7 +272,7 @@
<item msgid="4547883971364273343">"enfoque de audio"</item>
<item msgid="2603878814882344450">"volume principal"</item>
<item msgid="7136963238377062018">"volume da voz"</item>
- <item msgid="4270236897655923007">"volume do timbre"</item>
+ <item msgid="4270236897655923007">"volume do ton"</item>
<item msgid="6325739889222559394">"volume multimedia"</item>
<item msgid="5762123934816216821">"volume da alarma"</item>
<item msgid="785049718065337473">"volume das notificacións"</item>
@@ -339,7 +339,7 @@
<item msgid="3265262911688671938">"Enfoque de audio"</item>
<item msgid="2098976479485046797">"Volume principal"</item>
<item msgid="5660213838861789350">"Volume da voz"</item>
- <item msgid="7983336752371254444">"Volume do timbre"</item>
+ <item msgid="7983336752371254444">"Volume do ton"</item>
<item msgid="7878027809189330917">"Volume multimedia"</item>
<item msgid="7260546305036218513">"Volume da alarma"</item>
<item msgid="9103719301075748925">"Volume das notificacións"</item>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index 525b5c4..efeeda4 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -30,7 +30,7 @@
<item msgid="8392017019801393511">"તમામ"</item>
</string-array>
<string-array name="screen_timeout_entries">
- <item msgid="3342301044271143016">"15 સેકંડ"</item>
+ <item msgid="3342301044271143016">"15 સેકન્ડ"</item>
<item msgid="8881760709354815449">"30 સેકન્ડ"</item>
<item msgid="7589406073232279088">"1 મિનિટ"</item>
<item msgid="7001195990902244174">"2 મિનિટ"</item>
@@ -40,7 +40,7 @@
</string-array>
<string-array name="dream_timeout_entries">
<item msgid="3149294732238283185">"ક્યારેય નહીં"</item>
- <item msgid="2194151041885903260">"15 સેકંડ"</item>
+ <item msgid="2194151041885903260">"15 સેકન્ડ"</item>
<item msgid="5892295237131074341">"30 સેકન્ડ"</item>
<item msgid="3538441365970038213">"1 મિનિટ"</item>
<item msgid="412343871668955639">"2 મિનિટ"</item>
@@ -50,8 +50,8 @@
</string-array>
<string-array name="lock_after_timeout_entries">
<item msgid="8929270399652145290">"ત્વરિત"</item>
- <item msgid="6736512735606834431">"5 સેકંડ"</item>
- <item msgid="8044619388267891375">"15 સેકંડ"</item>
+ <item msgid="6736512735606834431">"5 સેકન્ડ"</item>
+ <item msgid="8044619388267891375">"15 સેકન્ડ"</item>
<item msgid="1822002388249545488">"30 સેકન્ડ"</item>
<item msgid="8538071621211916519">"1 મિનિટ"</item>
<item msgid="5663439580228932882">"2 મિનિટ"</item>
@@ -107,7 +107,7 @@
<item msgid="7981731051382306293">"TLS"</item>
<item msgid="2892994535305020162">"TTLS"</item>
<item msgid="435667726254379514">"PWD"</item>
- <item msgid="8549485714107012129">"SIM"</item>
+ <item msgid="8549485714107012129">"સિમ"</item>
<item msgid="1023893786681286517">"AKA"</item>
<item msgid="3030483188676375009">"AKA\'"</item>
</string-array>
@@ -122,8 +122,8 @@
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"પુશ બટન"</item>
- <item msgid="1624323946324499595">"પીઅર ઉપકરણ પરથી PIN"</item>
- <item msgid="5366790421523328066">"આ ઉપકરણ પરથી PIN"</item>
+ <item msgid="1624323946324499595">"પીઅર ઉપકરણ પરથી પિન"</item>
+ <item msgid="5366790421523328066">"આ ઉપકરણ પરથી પિન"</item>
</string-array>
<string-array name="wifi_p2p_status">
<item msgid="1701505390737218306">"કનેક્ટ કર્યું"</item>
@@ -169,7 +169,7 @@
<item msgid="5760470455461128892">"કોઈ નહીં"</item>
<item msgid="7480272092408291086">"MSCHAPV2"</item>
<item msgid="5881794903338319324">"GTC"</item>
- <item msgid="5610607665198791980">"SIM"</item>
+ <item msgid="5610607665198791980">"સિમ"</item>
<item msgid="2860798636241124128">"AKA"</item>
<item msgid="8926455723452645935">"AKA\'"</item>
</string-array>
@@ -248,7 +248,7 @@
<item msgid="446877710771379667">"કૅલેન્ડર વાંચો"</item>
<item msgid="7674458294386319722">"કૅલેન્ડર સંશોધિત કરો"</item>
<item msgid="8281201165558093009">"wi-fi સ્કેન કરો"</item>
- <item msgid="8694611243479480497">"સૂચના"</item>
+ <item msgid="8694611243479480497">"નોટિફિકેશન"</item>
<item msgid="7776439107987345446">"સેલ સ્કેન"</item>
<item msgid="514615766544675057">"કૉલ કરો"</item>
<item msgid="8181415497109310680">"SMS વાંચો"</item>
@@ -270,14 +270,14 @@
<item msgid="3045529469061083747">"ક્લિપબોર્ડ સંશોધિત કરો"</item>
<item msgid="5124443975763747838">"મીડિયા બટન્સ"</item>
<item msgid="4547883971364273343">"ઑડિઓ ફોકસ"</item>
- <item msgid="2603878814882344450">"માસ્ટર વોલ્યુમ"</item>
- <item msgid="7136963238377062018">"વૉઇસ વોલ્યુમ"</item>
- <item msgid="4270236897655923007">"રિંગ વોલ્યુમ"</item>
+ <item msgid="2603878814882344450">"માસ્ટર વૉલ્યૂમ"</item>
+ <item msgid="7136963238377062018">"વૉઇસ વૉલ્યૂમ"</item>
+ <item msgid="4270236897655923007">"રિંગ વૉલ્યૂમ"</item>
<item msgid="6325739889222559394">"મીડિયા વૉલ્યૂમ"</item>
- <item msgid="5762123934816216821">"એલાર્મ વોલ્યુમ"</item>
- <item msgid="785049718065337473">"સૂચના વૉલ્યૂમ"</item>
- <item msgid="6700305533746877052">"Bluetooth વૉલ્યૂમ"</item>
- <item msgid="2029227495214047094">"જાગૃત રહો"</item>
+ <item msgid="5762123934816216821">"એલાર્મ વૉલ્યૂમ"</item>
+ <item msgid="785049718065337473">"નોટિફિકેશન વૉલ્યૂમ"</item>
+ <item msgid="6700305533746877052">"બ્લૂટૂથ વૉલ્યૂમ"</item>
+ <item msgid="2029227495214047094">"સક્રિય રાખો"</item>
<item msgid="26109888160231211">"સ્થાનને મૉનિટર કરો"</item>
<item msgid="5753382310468855812">"હાઇ પાવર સ્થાન મૉનિટર કરો"</item>
<item msgid="3356591542543137332">"વપરાશ આંકડા મેળવો"</item>
@@ -315,7 +315,7 @@
<item msgid="6093344633066170692">"કૅલેન્ડર વાંચો"</item>
<item msgid="1334886368750347692">"કૅલેન્ડર સંશોધિત કરો"</item>
<item msgid="1638204101698708656">"સ્થાન"</item>
- <item msgid="2154671955760380322">"પોસ્ટ સૂચના"</item>
+ <item msgid="2154671955760380322">"પોસ્ટ નોટિફિકેશન"</item>
<item msgid="4282477730595931828">"સ્થાન"</item>
<item msgid="4891423912898525905">"કૉલ કરો"</item>
<item msgid="2623604824935968113">"SMS/MMS વાંચો"</item>
@@ -337,14 +337,14 @@
<item msgid="5238692940326972503">"ક્લિપબોર્ડ સંશોધિત કરો"</item>
<item msgid="5753789168376302997">"મીડિયા બટન્સ"</item>
<item msgid="3265262911688671938">"ઑડિઓ ફોકસ"</item>
- <item msgid="2098976479485046797">"માસ્ટર વોલ્યુમ"</item>
- <item msgid="5660213838861789350">"વૉઇસ વોલ્યુમ"</item>
- <item msgid="7983336752371254444">"રિંગ વોલ્યુમ"</item>
+ <item msgid="2098976479485046797">"માસ્ટર વૉલ્યૂમ"</item>
+ <item msgid="5660213838861789350">"વૉઇસ વૉલ્યૂમ"</item>
+ <item msgid="7983336752371254444">"રિંગ વૉલ્યૂમ"</item>
<item msgid="7878027809189330917">"મીડિયા વૉલ્યૂમ"</item>
- <item msgid="7260546305036218513">"એલાર્મ વોલ્યુમ"</item>
- <item msgid="9103719301075748925">"સૂચના વૉલ્યૂમ"</item>
- <item msgid="7025966722295861512">"Bluetooth વૉલ્યૂમ"</item>
- <item msgid="4665183401128289653">"જાગૃત રહો"</item>
+ <item msgid="7260546305036218513">"એલાર્મ વૉલ્યૂમ"</item>
+ <item msgid="9103719301075748925">"નોટિફિકેશન વૉલ્યૂમ"</item>
+ <item msgid="7025966722295861512">"બ્લૂટૂથ વૉલ્યૂમ"</item>
+ <item msgid="4665183401128289653">"સક્રિય રાખો"</item>
<item msgid="8584357129746649222">"સ્થાન"</item>
<item msgid="7669257279311110599">"સ્થાન"</item>
<item msgid="3459320345690097795">"ઉપયોગના આંકડા મેળવો"</item>
@@ -453,7 +453,7 @@
<item msgid="5069825997142785829">"નિરંતર"</item>
<item msgid="5779398140277006695">"ટોચની પ્રવૃત્તિ"</item>
<item msgid="1439598363694578255">"મહત્વપૂર્ણ (અગ્રભૂમિ)"</item>
- <item msgid="3396458970745718652">"મહત્વપૂર્ણ (પૃષ્ઠભૂમિ)"</item>
+ <item msgid="3396458970745718652">"મહત્વપૂર્ણ (બૅકગ્રાઉન્ડ)"</item>
<item msgid="5214825238247511992">"બેકઅપ"</item>
<item msgid="311372689168254967">"ભારે વજન"</item>
<item msgid="7438189122367820362">"સેવા (ચાલે છે)"</item>
@@ -474,8 +474,8 @@
<item msgid="6131821495505931173">"લાલ"</item>
</string-array>
<string-array name="automatic_storage_management_days">
- <item msgid="687318592238852312">"30 દિવસથી વધુ જૂનું"</item>
- <item msgid="2900554746706302178">"60 દિવસથી વધુ જૂનું"</item>
- <item msgid="5692284879054004388">"90 દિવસથી વધુ જૂનું"</item>
+ <item msgid="687318592238852312">"30 દિવસથી વધુ જૂના"</item>
+ <item msgid="2900554746706302178">"60 દિવસથી વધુ જૂના"</item>
+ <item msgid="5692284879054004388">"90 દિવસથી વધુ જૂના"</item>
</string-array>
</resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 8a2f33c..881f4ff 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -70,7 +70,7 @@
<item msgid="8934131797783724664">"स्कैन कर रहा है…"</item>
<item msgid="8513729475867537913">"कनेक्ट हो रहा है..."</item>
<item msgid="515055375277271756">"प्रमाणीकरण कर रहा है…"</item>
- <item msgid="1943354004029184381">"IP पता प्राप्त कर रहा है…"</item>
+ <item msgid="1943354004029184381">"आईपी पता ले रहा है…"</item>
<item msgid="4221763391123233270">"कनेक्ट किया गया"</item>
<item msgid="624838831631122137">"निलंबित"</item>
<item msgid="7979680559596111948">"डिस्कनेक्ट हो रहा है..."</item>
@@ -84,7 +84,7 @@
<item msgid="8878186979715711006">"स्कैन कर रहा है…"</item>
<item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्ट कर रहा है…"</item>
<item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> के साथ प्रमाणीकरण कर रहा है…"</item>
- <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से IP पता प्राप्त कर रहा है…"</item>
+ <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से आईपी पता ले रहा है..."</item>
<item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्ट किया गया"</item>
<item msgid="1330262655415760617">"निलंबित"</item>
<item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से डिस्कनेक्ट कर रहा है…"</item>
@@ -136,7 +136,7 @@
<item msgid="8151962652413645395">"2 मिनट"</item>
<item msgid="8675215713017289017">"5 मिनट"</item>
<item msgid="477015974247590543">"1 घंटा"</item>
- <item msgid="5198271470953124739">"कभी समयबाह्य नहीं"</item>
+ <item msgid="5198271470953124739">"कभी टाइम आउट नहीं होगा"</item>
</string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"कमज़ोर"</item>
@@ -230,17 +230,17 @@
<item msgid="4498124044785815005">"सिस्टम को निर्धारित करने दें"</item>
</string-array>
<string-array name="app_ops_categories">
- <item msgid="6358963769537892925">"स्थान"</item>
+ <item msgid="6358963769537892925">"जगह"</item>
<item msgid="255608127647030286">"व्यक्तिगत"</item>
<item msgid="4588829735729884491">"संदेश सेवा"</item>
<item msgid="886742181977884584">"मीडिया"</item>
<item msgid="7924928667052300589">"डिवाइस"</item>
</string-array>
<string-array name="app_ops_summaries">
- <item msgid="4979188868761515915">"अस्पष्ट स्थान"</item>
- <item msgid="5789673140227507995">"सटीक स्थान"</item>
+ <item msgid="4979188868761515915">"अस्पष्ट जगह"</item>
+ <item msgid="5789673140227507995">"सटीक जगह"</item>
<item msgid="1061584358377390581">"GPS"</item>
- <item msgid="5387405117297558954">"कंपन"</item>
+ <item msgid="5387405117297558954">"कंपन (वाइब्रेशन)"</item>
<item msgid="3434165993711230924">"संपर्क पढ़ें"</item>
<item msgid="616161687718081936">"संपर्कों को बदलें"</item>
<item msgid="7638002295329050091">"कॉल लॉग पढ़ें"</item>
@@ -248,21 +248,21 @@
<item msgid="446877710771379667">"कैलेंडर पढ़ें"</item>
<item msgid="7674458294386319722">"कैलेंडर बदलें"</item>
<item msgid="8281201165558093009">"वाई-फ़ाई स्कैन"</item>
- <item msgid="8694611243479480497">"नोटिफिकेशन"</item>
+ <item msgid="8694611243479480497">"सूचना"</item>
<item msgid="7776439107987345446">"सेल स्कैन"</item>
<item msgid="514615766544675057">"फ़ोन पर कॉल करें"</item>
- <item msgid="8181415497109310680">"SMS पढ़ें"</item>
- <item msgid="6816551144382117307">"SMS लिखें"</item>
- <item msgid="4600463921908905030">"SMS प्राप्त करें"</item>
- <item msgid="5958926493289432745">"आपातकालीन SMS प्राप्त करें"</item>
- <item msgid="4945269495221089540">"MMS प्राप्त करें"</item>
+ <item msgid="8181415497109310680">"मैसेज (एसएमएस) पढ़ें"</item>
+ <item msgid="6816551144382117307">"मैसेज (एसएमएस) लिखें"</item>
+ <item msgid="4600463921908905030">"मैसेज (एसएमएस) पाएं"</item>
+ <item msgid="5958926493289432745">"आपातकालीन मैसेज (एसएमएस) पाएं"</item>
+ <item msgid="4945269495221089540">"मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
<item msgid="5570472453573929087">"WAP पुश प्राप्त करें"</item>
- <item msgid="7125408150230860501">"SMS भेजें"</item>
- <item msgid="7080337936612188061">"ICC SMS पढ़ें"</item>
- <item msgid="587124103118495063">"ICC SMS लिखें"</item>
+ <item msgid="7125408150230860501">"मैसेज (एसएमएस) भेजें"</item>
+ <item msgid="7080337936612188061">"ICC मैसेज (एसएमएस) पढ़ें"</item>
+ <item msgid="587124103118495063">"ICC मैसेज (एसएमएस) लिखें"</item>
<item msgid="2320577158869025503">"सेटिंग बदलें"</item>
<item msgid="1545733463471924009">"ऊपर बनाएं"</item>
- <item msgid="3609046903962454582">"नोटिफिकेशन को एक्सेस करें"</item>
+ <item msgid="3609046903962454582">"सूचना पाएं"</item>
<item msgid="4671646036128214513">"कैमरा"</item>
<item msgid="1097324338692486211">"ऑडियो रिकॉर्ड करें"</item>
<item msgid="5031552983987798163">"ऑडियो चलाएं"</item>
@@ -275,11 +275,11 @@
<item msgid="4270236897655923007">"रिंग आवाज़"</item>
<item msgid="6325739889222559394">"मीडिया वॉल्यूम"</item>
<item msgid="5762123934816216821">"अलार्म वॉल्यूम"</item>
- <item msgid="785049718065337473">"नोटिफिकेशन वॉल्यूम"</item>
+ <item msgid="785049718065337473">"सूचना की आवाज़"</item>
<item msgid="6700305533746877052">"bluetooth आवाज़"</item>
<item msgid="2029227495214047094">"सचेत रखें"</item>
- <item msgid="26109888160231211">"मॉनिटर का स्थान"</item>
- <item msgid="5753382310468855812">"उच्च पावर वाले स्थान की निगरानी करें"</item>
+ <item msgid="26109888160231211">"जगह की निगरानी करें"</item>
+ <item msgid="5753382310468855812">"उच्च पावर वाली जगह की निगरानी करें"</item>
<item msgid="3356591542543137332">"उपयोग के आंकड़े प्राप्त करें"</item>
<item msgid="3073734345226842233">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
<item msgid="2111767435887685265">"टोस्ट दिखाएं"</item>
@@ -291,45 +291,45 @@
<item msgid="8582699692765917557">"फ़ोन स्थिति पढ़ें"</item>
<item msgid="1474039653814954902">"वॉइसमेल जोड़ें"</item>
<item msgid="7222837656938871633">"सिप का उपयोग करें"</item>
- <item msgid="6108267038969274380">"आउटगोइंग कॉल संसाधित करें"</item>
+ <item msgid="6108267038969274380">"कॉल करें"</item>
<item msgid="4823402479973873358">"फ़िंगरप्रिंट"</item>
<item msgid="5895843015407713543">"शरीर संवेदक"</item>
- <item msgid="1436446526955010826">"सेल प्रसारण पढ़ें"</item>
- <item msgid="884172201575690484">"कृत्रिम स्थान"</item>
+ <item msgid="1436446526955010826">"सेल ब्रॉडकास्ट (CBC) पढ़ें"</item>
+ <item msgid="884172201575690484">"नकली जगह"</item>
<item msgid="3591971310048485247">"मेमोरी पढ़ें"</item>
<item msgid="4041187808621866119">"मेमोरी लिखें"</item>
<item msgid="6628873315024166197">"स्क्रीन चालू करें"</item>
<item msgid="3253368931113490863">"खाते प्राप्त करें"</item>
<item msgid="780392378084812901">"पृष्ठभूमि में चलाएं"</item>
- <item msgid="2629748510881309577">"एक्सेस-योग्यता वॉल्यूम"</item>
+ <item msgid="2629748510881309577">"सुलभता सुविधाओं के लिए वॉल्यूम"</item>
</string-array>
<string-array name="app_ops_labels">
- <item msgid="6602854600289714121">"स्थान"</item>
- <item msgid="8677040780775113033">"स्थान"</item>
- <item msgid="1660743989948992916">"स्थान"</item>
- <item msgid="8791172739860195290">"कंपन"</item>
+ <item msgid="6602854600289714121">"जगह"</item>
+ <item msgid="8677040780775113033">"जगह"</item>
+ <item msgid="1660743989948992916">"जगह"</item>
+ <item msgid="8791172739860195290">"कंपन (वाइब्रेशन)"</item>
<item msgid="383413555642128046">"संपर्क पढ़ें"</item>
<item msgid="3654594895269697313">"संपर्कों को बदलें"</item>
<item msgid="7928393476362362538">"कॉल लॉग पढ़ें"</item>
<item msgid="6248591205254641116">"कॉल लॉग बदलें"</item>
<item msgid="6093344633066170692">"कैलेंडर पढ़ें"</item>
<item msgid="1334886368750347692">"कैलेंडर बदलें"</item>
- <item msgid="1638204101698708656">"स्थान"</item>
- <item msgid="2154671955760380322">"नोटिफिकेशन पोस्ट करें"</item>
- <item msgid="4282477730595931828">"स्थान"</item>
+ <item msgid="1638204101698708656">"जगह"</item>
+ <item msgid="2154671955760380322">"सूचना पोस्ट करें"</item>
+ <item msgid="4282477730595931828">"जगह"</item>
<item msgid="4891423912898525905">"फ़ोन पर कॉल करें"</item>
- <item msgid="2623604824935968113">"SMS/MMS पढ़ें"</item>
- <item msgid="4420177125221176306">"SMS/MMS लिखें"</item>
- <item msgid="3986142739951490025">"SMS/MMS प्राप्त करें"</item>
- <item msgid="3984213795861739778">"SMS/MMS प्राप्त करें"</item>
- <item msgid="3656243523752472788">"SMS/MMS प्राप्त करें"</item>
- <item msgid="8105802370238551510">"SMS/MMS प्राप्त करें"</item>
- <item msgid="1407766984645388488">"SMS/MMS भेजें"</item>
- <item msgid="3527273606643794973">"SMS/MMS पढ़ें"</item>
- <item msgid="4370895547001583812">"SMS/MMS लिखें"</item>
+ <item msgid="2623604824935968113">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पढ़ें"</item>
+ <item msgid="4420177125221176306">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) लिखें"</item>
+ <item msgid="3986142739951490025">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+ <item msgid="3984213795861739778">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+ <item msgid="3656243523752472788">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+ <item msgid="8105802370238551510">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+ <item msgid="1407766984645388488">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) भेजें"</item>
+ <item msgid="3527273606643794973">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पढ़ें"</item>
+ <item msgid="4370895547001583812">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) लिखें"</item>
<item msgid="4218544235221631789">"सेटिंग बदलें"</item>
<item msgid="736541391767350377">"ऊपर बनाएं"</item>
- <item msgid="5530815681721654194">"नोटिफिकेशन को एक्सेस करें"</item>
+ <item msgid="5530815681721654194">"सूचना पाएं"</item>
<item msgid="781213371706962767">"कैमरा"</item>
<item msgid="1720492593061838172">"ऑडियो रिकॉर्ड करें"</item>
<item msgid="3493046322001257041">"ऑडियो चलाएं"</item>
@@ -342,11 +342,11 @@
<item msgid="7983336752371254444">"रिंग आवाज़"</item>
<item msgid="7878027809189330917">"मीडिया वॉल्यूम"</item>
<item msgid="7260546305036218513">"अलार्म वॉल्यूम"</item>
- <item msgid="9103719301075748925">"नोटिफिकेशन वॉल्यूम"</item>
+ <item msgid="9103719301075748925">"सूचना की आवाज़"</item>
<item msgid="7025966722295861512">"ब्लूटूथ वॉल्यूम"</item>
<item msgid="4665183401128289653">"सचेत रखें"</item>
- <item msgid="8584357129746649222">"स्थान"</item>
- <item msgid="7669257279311110599">"स्थान"</item>
+ <item msgid="8584357129746649222">"जगह"</item>
+ <item msgid="7669257279311110599">"जगह"</item>
<item msgid="3459320345690097795">"उपयोग के आंकड़े प्राप्त करें"</item>
<item msgid="1312534577834048535">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
<item msgid="427580389823724225">"टोस्ट दिखाएं"</item>
@@ -358,17 +358,17 @@
<item msgid="8571369610363539266">"फ़ोन स्थिति पढ़ें"</item>
<item msgid="4542463358215230845">"वॉइसमेल जोड़ें"</item>
<item msgid="864565065016166003">"सिप का उपयोग करें"</item>
- <item msgid="1958009349883195116">"आउटगोइंग कॉल संसाधित करें"</item>
+ <item msgid="1958009349883195116">"कॉल करें"</item>
<item msgid="8526563410140613458">"फ़िंगरप्रिंट"</item>
<item msgid="7864822459293570891">"शरीर संवेदक"</item>
- <item msgid="6798698496904810960">"सेल प्रसारण पढ़ें"</item>
- <item msgid="5242052845700875820">"कृत्रिम स्थान"</item>
+ <item msgid="6798698496904810960">"सेल ब्रॉडकास्ट (CBC) पढ़ें"</item>
+ <item msgid="5242052845700875820">"नकली जगह"</item>
<item msgid="1246296877820358565">"मेमोरी पढ़ें"</item>
<item msgid="2404067308793740341">"मेमोरी लिखें"</item>
<item msgid="5832543806893763620">"स्क्रीन चालू करें"</item>
<item msgid="5258373962467495905">"खाते प्राप्त करें"</item>
<item msgid="334625385979270703">"पृष्ठभूमि में चलाएं"</item>
- <item msgid="9039213578110332702">"एक्सेस-योग्यता वॉल्यूम"</item>
+ <item msgid="9039213578110332702">"सुलभता सुविधाओं के लिए वॉल्यूम"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"कम"</item>
@@ -428,7 +428,7 @@
<item msgid="6692305604213080515">"आरंभ हो रहा है..."</item>
<item msgid="8001704909356800092">"कनेक्ट हो रहा है..."</item>
<item msgid="4039737283841672166">"कनेक्ट किया गया"</item>
- <item msgid="4042143101664725090">"समयबाह्य"</item>
+ <item msgid="4042143101664725090">"कोई काम खत्म होने से पहले का समय अंतर (टाइम आउट)"</item>
<item msgid="7664124146786465092">"विफल"</item>
</string-array>
<string-array name="security_settings_premium_sms_values">
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index a09f5d5..8212eaf 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -340,7 +340,7 @@
<item msgid="2098976479485046797">"Ձայնի հիմնական բարձրություն"</item>
<item msgid="5660213838861789350">"Ձայնի բարձրություն"</item>
<item msgid="7983336752371254444">"Զանգի բարձրություն"</item>
- <item msgid="7878027809189330917">"Մեդիանյութերի ձայնի բարձրություն"</item>
+ <item msgid="7878027809189330917">"Մուլտիմեդիայի ձայնը"</item>
<item msgid="7260546305036218513">"Զարթուցիչի ձայնի բարձրություն"</item>
<item msgid="9103719301075748925">"Ծանուցման ձայնի բարձրություն"</item>
<item msgid="7025966722295861512">"Bluetooth-ի ձայնի բարձրություն"</item>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 9076344..f846cf9 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -68,7 +68,7 @@
<string-array name="wifi_status">
<item msgid="1922181315419294640"></item>
<item msgid="8934131797783724664">"スキャン中..."</item>
- <item msgid="8513729475867537913">"接続中..."</item>
+ <item msgid="8513729475867537913">"接続処理中..."</item>
<item msgid="515055375277271756">"認証中..."</item>
<item msgid="1943354004029184381">"IPアドレスを取得中..."</item>
<item msgid="4221763391123233270">"接続済み"</item>
@@ -426,7 +426,7 @@
<string-array name="vpn_states">
<item msgid="8621078286418985762">"切断されました"</item>
<item msgid="6692305604213080515">"初期化中..."</item>
- <item msgid="8001704909356800092">"接続中..."</item>
+ <item msgid="8001704909356800092">"接続処理中..."</item>
<item msgid="4039737283841672166">"接続されました"</item>
<item msgid="4042143101664725090">"タイムアウト"</item>
<item msgid="7664124146786465092">"失敗しました"</item>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index 1cc501a..d93c79d 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -174,7 +174,7 @@
<item msgid="8926455723452645935">"AKA\'"</item>
</string-array>
<string-array name="wifi_phase2_entries">
- <item msgid="1818786254010764570">"არც ერთი"</item>
+ <item msgid="1818786254010764570">"არცერთი"</item>
<item msgid="6189918678874123056">"PAP"</item>
<item msgid="1524112260493662517">"MSCHAP"</item>
<item msgid="5923246669412752932">"MSCHAPV2"</item>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index dcdd510..11d8dee 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -274,7 +274,7 @@
<item msgid="7136963238377062018">"កម្រិតសំឡេង"</item>
<item msgid="4270236897655923007">"កម្រិតសំឡេងរោទ៍"</item>
<item msgid="6325739889222559394">"កម្រិតសំឡេងមេឌៀ"</item>
- <item msgid="5762123934816216821">"កម្រិតសំឡេងរោទ៍"</item>
+ <item msgid="5762123934816216821">"កម្រិតសំឡេងម៉ោងរោទ៍"</item>
<item msgid="785049718065337473">"កម្រិតសំឡេងការជូនដំណឹង"</item>
<item msgid="6700305533746877052">"កម្រិតសំឡេងប៊្លូធូស"</item>
<item msgid="2029227495214047094">"មិនដេក"</item>
@@ -341,7 +341,7 @@
<item msgid="5660213838861789350">"កម្រិតសំឡេង"</item>
<item msgid="7983336752371254444">"កម្រិតសំឡេងរោទ៍"</item>
<item msgid="7878027809189330917">"កម្រិតសំឡេងមេឌៀ"</item>
- <item msgid="7260546305036218513">"កម្រិតសំឡេងរោទ៍"</item>
+ <item msgid="7260546305036218513">"កម្រិតសំឡេងម៉ោងរោទ៍"</item>
<item msgid="9103719301075748925">"កម្រិតសំឡេងការជូនដំណឹង"</item>
<item msgid="7025966722295861512">"កម្រិតសំឡេងប៊្លូធូស"</item>
<item msgid="4665183401128289653">"មិនដេក"</item>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index 9b5a56c..3dcbee4 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -21,7 +21,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="timezone_filters">
- <item msgid="5296756001147094692">"ಅಮೆರಿಕಾ"</item>
+ <item msgid="5296756001147094692">"ಅಮೆರಿಕ"</item>
<item msgid="3005562397632768392">"ಯೂರೋಪ್"</item>
<item msgid="5696915123093701218">"ಆಫ್ರಿಕಾ"</item>
<item msgid="4439789052790868249">"ಏಷ್ಯಾ"</item>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index ac99cad..bc9185f 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -273,7 +273,7 @@
<item msgid="2603878814882344450">"үн башкаргыч"</item>
<item msgid="7136963238377062018">"үн деңгээли"</item>
<item msgid="4270236897655923007">"шыңгырактын үнү"</item>
- <item msgid="6325739889222559394">"медианын үнү"</item>
+ <item msgid="6325739889222559394">"мультимедианын үнү"</item>
<item msgid="5762123934816216821">"ойготкучтун үнү"</item>
<item msgid="785049718065337473">"эскерткичтин үнү"</item>
<item msgid="6700305533746877052">"bluetooth үнү"</item>
@@ -340,7 +340,7 @@
<item msgid="2098976479485046797">"Үн башкаргыч"</item>
<item msgid="5660213838861789350">"Үндүн деңгээли"</item>
<item msgid="7983336752371254444">"Шыңгырактын үнү"</item>
- <item msgid="7878027809189330917">"Медианын үнү"</item>
+ <item msgid="7878027809189330917">"Мультимедианын үнү"</item>
<item msgid="7260546305036218513">"Ойготкучтун үнү"</item>
<item msgid="9103719301075748925">"Эскерткичтин үнү"</item>
<item msgid="7025966722295861512">"Bluetooth үнү"</item>
diff --git a/res/values-mcc262-mnc02-bn/strings.xml b/res/values-mcc262-mnc02-bn/strings.xml
index 1b66ebf..3ed6c9fa 100644
--- a/res/values-mcc262-mnc02-bn/strings.xml
+++ b/res/values-mcc262-mnc02-bn/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ওয়াই-ফাই এর মাধ্যমে জরুরী কল করা যাবে না। জরুরী কল করার চেষ্টা করলে আপনার ডিভাইস নিজে থেকেই মোবাইল নেটওয়ার্ক ব্যবহার করতে শুরু করবে। যেখানে মোবাইল নেটওয়ার্ক কভারেজ আছে, শুধুমাত্র সেখানেই জরুরী কল করা যাবে।"</string>
+ <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ওয়াই-ফাই এর মাধ্যমে জরুরি কল করা যাবে না। জরুরি কল করার চেষ্টা করলে আপনার ডিভাইস নিজে থেকেই মোবাইল নেটওয়ার্ক ব্যবহার করতে শুরু করবে। যেখানে মোবাইল নেটওয়ার্ক কভারেজ আছে, শুধুমাত্র সেখানেই জরুরি কল করা যাবে।"</string>
</resources>
diff --git a/res/values-mcc262-mnc02-gl/strings.xml b/res/values-mcc262-mnc02-gl/strings.xml
index 2c70218..d67c86f 100644
--- a/res/values-mcc262-mnc02-gl/strings.xml
+++ b/res/values-mcc262-mnc02-gl/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Non podes facer chamadas de emerxencia mediante as chamadas por wifi. Se tentas realizar unha chamada de emerxencia, o dispositivo utilizará automaticamente a rede móbil. As chamadas de emerxencia só se poden facer en zonas con cobertura de rede de telefonía móbil."</string>
+ <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Non podes facer chamadas de urxencia mediante as chamadas por wifi. Se tentas realizar unha chamada de urxencia, o dispositivo utilizará automaticamente a rede móbil. As chamadas de urxencia só se poden facer en zonas con cobertura de rede de telefonía móbil."</string>
</resources>
diff --git a/res/values-mcc262-mnc02-gu/strings.xml b/res/values-mcc262-mnc02-gu/strings.xml
index ac24429..f91f467 100644
--- a/res/values-mcc262-mnc02-gu/strings.xml
+++ b/res/values-mcc262-mnc02-gu/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"તમે Wi-Fi કૉલિંગ મારફતે કટોકટીનો કૉલ કરી શકતા નથી. જો તમે કોઈ કટોકટીનો કૉલ કરવાનો પ્રયાસ કરો છો, તો તમારું ઉપકરણ આપમેળે મોબાઇલ નેટવર્કનો ઉપયોગ કરશે. માત્ર મોબાઇલ નેટવર્ક કવરેજવાળા વિસ્તારમાં જ કટોકટીનો કૉલ કરી શકાય છે."</string>
+ <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"તમે વાઇ-ફાઇ કૉલિંગ મારફતે કટોકટીનો કૉલ કરી શકતા નથી. જો તમે કોઈ કટોકટીનો કૉલ કરવાનો પ્રયાસ કરો છો, તો તમારું ઉપકરણ આપમેળે મોબાઇલ નેટવર્કનો ઉપયોગ કરશે. માત્ર મોબાઇલ નેટવર્ક કવરેજવાળા વિસ્તારમાં જ કટોકટીનો કૉલ કરી શકાય છે."</string>
</resources>
diff --git a/res/values-mcc262-mnc02-pa/strings.xml b/res/values-mcc262-mnc02-pa/strings.xml
index 39b1080..8c7b2c8 100644
--- a/res/values-mcc262-mnc02-pa/strings.xml
+++ b/res/values-mcc262-mnc02-pa/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ਤੁਸੀਂ Wi-Fi ਕਾਲਿੰਗ ਰਾਹੀਂ ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਕੋਈ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗੀ। ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਸਿਰਫ਼ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਕਵਰੇਜ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</string>
+ <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ਤੁਸੀਂ ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਰਾਹੀਂ ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਕੋਈ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗਾ। ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਸਿਰਫ਼ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਕਵਰੇਜ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</string>
</resources>
diff --git a/res/values-mcc262-mnc02-sk/strings.xml b/res/values-mcc262-mnc02-sk/strings.xml
index c951070..48abf40 100644
--- a/res/values-mcc262-mnc02-sk/strings.xml
+++ b/res/values-mcc262-mnc02-sk/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Tiesňové volania môžete uskutočniť prostredníctvom funkcie volania cez Wi-Fi. Ak sa pokúsite uskutočniť tiesňové volanie, zariadenie automaticky použije mobilnú sieť. Tiesňové volania je možné uskutočniť iba v oblastiach s mobilným pokrytím."</string>
+ <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Tiesňové volania môžete uskutočniť prostredníctvom funkcie volania cez Wi‑Fi. Ak sa pokúsite uskutočniť tiesňové volanie, zariadenie automaticky použije mobilnú sieť. Tiesňové volania je možné uskutočniť iba v oblastiach s mobilným pokrytím."</string>
</resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 1f76012..a4c22f6 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -225,7 +225,7 @@
<item msgid="2681427309183221543">"GID"</item>
</string-array>
<string-array name="app_install_location_entries">
- <item msgid="8151497958991952759">"Внатрешна меморија"</item>
+ <item msgid="8151497958991952759">"Внатрешен капацитет"</item>
<item msgid="3738430123799803530">"Пренослива СД картичка"</item>
<item msgid="4498124044785815005">"Дозволи системот да одлучи"</item>
</string-array>
@@ -260,7 +260,7 @@
<item msgid="7125408150230860501">"испрати SMS порака"</item>
<item msgid="7080337936612188061">"прочитај SMS порака на ICC"</item>
<item msgid="587124103118495063">"напиши SMS порака на ICC"</item>
- <item msgid="2320577158869025503">"измени подесувања"</item>
+ <item msgid="2320577158869025503">"измени поставки"</item>
<item msgid="1545733463471924009">"цртај на врвот"</item>
<item msgid="3609046903962454582">"пристапи кон известувања"</item>
<item msgid="4671646036128214513">"фотоапарат"</item>
@@ -327,7 +327,7 @@
<item msgid="1407766984645388488">"Испрати SMS/MMS порака"</item>
<item msgid="3527273606643794973">"Прочитај SMS/MMS порака"</item>
<item msgid="4370895547001583812">"Напиши SMS/MMS порака"</item>
- <item msgid="4218544235221631789">"Измени подесувања"</item>
+ <item msgid="4218544235221631789">"Измени поставки"</item>
<item msgid="736541391767350377">"Цртај на врвот"</item>
<item msgid="5530815681721654194">"Пристапи кон известувања"</item>
<item msgid="781213371706962767">"Камера"</item>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 85d818f..48e531c 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -243,8 +243,8 @@
<item msgid="5387405117297558954">"വൈബ്രേറ്റുചെയ്യുക"</item>
<item msgid="3434165993711230924">"കോൺടാക്റ്റുകൾ റീഡുചെയ്യുക"</item>
<item msgid="616161687718081936">"കോൺടാക്റ്റുകൾ പരിഷ്ക്കരിക്കുക"</item>
- <item msgid="7638002295329050091">"കോൾ ലോഗ് റീഡുചെയ്യുക"</item>
- <item msgid="6546959730920410907">"കോൾ ലോഗ് പരിഷ്ക്കരിക്കുക"</item>
+ <item msgid="7638002295329050091">"കോൾ ചരിത്രം റീഡ് ചെയ്യുക"</item>
+ <item msgid="6546959730920410907">"കോൾ ചരിത്രം പരിഷ്ക്കരിക്കുക"</item>
<item msgid="446877710771379667">"കലണ്ടർ റീഡുചെയ്യുക"</item>
<item msgid="7674458294386319722">"കലണ്ടർ പരിഷ്ക്കരിക്കുക"</item>
<item msgid="8281201165558093009">"wi-fi സ്കാൻ"</item>
@@ -307,11 +307,11 @@
<item msgid="6602854600289714121">"ലൊക്കേഷൻ"</item>
<item msgid="8677040780775113033">"ലൊക്കേഷൻ"</item>
<item msgid="1660743989948992916">"ലൊക്കേഷൻ"</item>
- <item msgid="8791172739860195290">"വൈബ്രേറ്റുചെയ്യുക"</item>
+ <item msgid="8791172739860195290">"വൈബ്രേറ്റ് ചെയ്യുക"</item>
<item msgid="383413555642128046">"കോൺടാക്റ്റുകൾ റീഡുചെയ്യുക"</item>
<item msgid="3654594895269697313">"കോൺടാക്റ്റുകൾ പരിഷ്ക്കരിക്കുക"</item>
- <item msgid="7928393476362362538">"കോൾ ലോഗ് റീഡുചെയ്യുക"</item>
- <item msgid="6248591205254641116">"കോൾ ലോഗ് പരിഷ്ക്കരിക്കുക"</item>
+ <item msgid="7928393476362362538">"കോൾ ചരിത്രം റീഡ് ചെയ്യുക"</item>
+ <item msgid="6248591205254641116">"കോൾ ചരിത്രം പരിഷ്ക്കരിക്കുക"</item>
<item msgid="6093344633066170692">"കലണ്ടർ റീഡുചെയ്യുക"</item>
<item msgid="1334886368750347692">"കലണ്ടർ പരിഷ്ക്കരിക്കുക"</item>
<item msgid="1638204101698708656">"ലൊക്കേഷൻ"</item>
diff --git a/res/values-mr-nokeys/strings.xml b/res/values-mr-nokeys/strings.xml
index 3d5a6a8..db0e2ea 100644
--- a/res/values-mr-nokeys/strings.xml
+++ b/res/values-mr-nokeys/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applications_settings_summary" msgid="6616938758022986257">"अनुप्रयोग व्यवस्थापित करा"</string>
+ <string name="applications_settings_summary" msgid="6616938758022986257">"अॅप्लिकेशन व्यवस्थापित करा"</string>
</resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 3940dab..b6b08ae 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -70,7 +70,7 @@
<item msgid="8934131797783724664">"स्कॅन करत आहे…"</item>
<item msgid="8513729475867537913">"कनेक्ट करत आहे..."</item>
<item msgid="515055375277271756">"प्रमाणीकरण करत आहे…"</item>
- <item msgid="1943354004029184381">"IP पत्ता प्राप्त करत आहे…"</item>
+ <item msgid="1943354004029184381">"IP पत्ता मिळवत आहे…"</item>
<item msgid="4221763391123233270">"कनेक्ट केले"</item>
<item msgid="624838831631122137">"निलंबित"</item>
<item msgid="7979680559596111948">"डिस्कनेक्ट करत आहे..."</item>
@@ -84,7 +84,7 @@
<item msgid="8878186979715711006">"स्कॅन करत आहे…"</item>
<item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वर कनेक्ट करत आहे…"</item>
<item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> सह प्रमाणीकरण करत आहे…"</item>
- <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वरून IP पत्ता प्राप्त करत आहे…"</item>
+ <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वरून IP पत्ता मिळवत आहे…"</item>
<item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वर कनेक्ट केले आहे"</item>
<item msgid="1330262655415760617">"निलंबित"</item>
<item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वरून डिस्कनेक्ट करत आहे…"</item>
@@ -136,7 +136,7 @@
<item msgid="8151962652413645395">"2 मिनिटे"</item>
<item msgid="8675215713017289017">"5 मिनिटे"</item>
<item msgid="477015974247590543">"1 तास"</item>
- <item msgid="5198271470953124739">"कधीही कालबाह्य नाही"</item>
+ <item msgid="5198271470953124739">"कधीही टाइमआउट नाही"</item>
</string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"खराब"</item>
@@ -225,14 +225,14 @@
<item msgid="2681427309183221543">"GID"</item>
</string-array>
<string-array name="app_install_location_entries">
- <item msgid="8151497958991952759">"अंतर्गत डिव्हाइस संचयन"</item>
+ <item msgid="8151497958991952759">"अंतर्गत डिव्हाइस स्टोरेज"</item>
<item msgid="3738430123799803530">"काढण्यायोग्य SD कार्ड"</item>
<item msgid="4498124044785815005">"सिस्टम ला ठरवू द्या"</item>
</string-array>
<string-array name="app_ops_categories">
<item msgid="6358963769537892925">"स्थान"</item>
<item msgid="255608127647030286">"वैयक्तिक"</item>
- <item msgid="4588829735729884491">"संदेशन"</item>
+ <item msgid="4588829735729884491">"मेसेजिंग"</item>
<item msgid="886742181977884584">"मीडिया"</item>
<item msgid="7924928667052300589">"डिव्हाइस"</item>
</string-array>
@@ -262,7 +262,7 @@
<item msgid="587124103118495063">"ICC SMS लिहा"</item>
<item msgid="2320577158869025503">"सेटिंग्ज सुधारित करा"</item>
<item msgid="1545733463471924009">"शीर्षस्थानी रेखांकित करा"</item>
- <item msgid="3609046903962454582">"सूचनांमध्ये प्रवेश करा"</item>
+ <item msgid="3609046903962454582">"सूचना अॅक्सेस करा"</item>
<item msgid="4671646036128214513">"कॅमेरा"</item>
<item msgid="1097324338692486211">"ऑडिओ रेकॉर्ड करा"</item>
<item msgid="5031552983987798163">"ऑडिओ प्ले करा"</item>
@@ -276,7 +276,7 @@
<item msgid="6325739889222559394">"मीडिया व्हॉल्यूम"</item>
<item msgid="5762123934816216821">"अलार्म व्हॉल्यूम"</item>
<item msgid="785049718065337473">"सूचना व्हॉल्यूम"</item>
- <item msgid="6700305533746877052">"ब्लूटुथ व्हॉल्यूम"</item>
+ <item msgid="6700305533746877052">"ब्लूटूथ व्हॉल्यूम"</item>
<item msgid="2029227495214047094">"सक्रिय ठेवा"</item>
<item msgid="26109888160231211">"स्थानाचे परीक्षण करा"</item>
<item msgid="5753382310468855812">"उच्च पॉवर स्थानाचे परीक्षण करा"</item>
@@ -329,7 +329,7 @@
<item msgid="4370895547001583812">"SMS/MMS लिहा"</item>
<item msgid="4218544235221631789">"सेटिंग्ज सुधारित करा"</item>
<item msgid="736541391767350377">"शीर्षस्थानी रेखांकित करा"</item>
- <item msgid="5530815681721654194">"सूचनांमध्ये प्रवेश करा"</item>
+ <item msgid="5530815681721654194">"सूचना अॅक्सेस करा"</item>
<item msgid="781213371706962767">"कॅमेरा"</item>
<item msgid="1720492593061838172">"ऑडिओ रेकॉर्ड करा"</item>
<item msgid="3493046322001257041">"ऑडिओ प्ले करा"</item>
@@ -343,7 +343,7 @@
<item msgid="7878027809189330917">"मीडिया व्हॉल्यूम"</item>
<item msgid="7260546305036218513">"अलार्म व्हॉल्यूम"</item>
<item msgid="9103719301075748925">"सूचना व्हॉल्यूम"</item>
- <item msgid="7025966722295861512">"ब्लूटुथ व्हॉल्यूम"</item>
+ <item msgid="7025966722295861512">"ब्लूटूथ व्हॉल्यूम"</item>
<item msgid="4665183401128289653">"सक्रिय ठेवा"</item>
<item msgid="8584357129746649222">"स्थान"</item>
<item msgid="7669257279311110599">"स्थान"</item>
@@ -428,7 +428,7 @@
<item msgid="6692305604213080515">"प्रारंभ करत आहे…"</item>
<item msgid="8001704909356800092">"कनेक्ट करीत आहे..."</item>
<item msgid="4039737283841672166">"कनेक्ट केले"</item>
- <item msgid="4042143101664725090">"कालबाह्य"</item>
+ <item msgid="4042143101664725090">"टाइमआउट"</item>
<item msgid="7664124146786465092">"अयशस्वी"</item>
</string-array>
<string-array name="security_settings_premium_sms_values">
@@ -451,7 +451,7 @@
</string-array>
<string-array name="proc_stats_process_states">
<item msgid="5069825997142785829">"कायम"</item>
- <item msgid="5779398140277006695">"शीर्ष क्रियाकलाप"</item>
+ <item msgid="5779398140277006695">"आघाडीच्या अॅक्टिव्हिटी"</item>
<item msgid="1439598363694578255">"महत्त्वाचे (अग्रभाग)"</item>
<item msgid="3396458970745718652">"महत्त्वाचे (पार्श्वभूमी)"</item>
<item msgid="5214825238247511992">"बॅकअप घ्या"</item>
@@ -459,10 +459,10 @@
<item msgid="7438189122367820362">"सेवा (चालत आहे)"</item>
<item msgid="918687422516982498">"सेवा (रीस्टार्ट करत आहे)"</item>
<item msgid="6807727069641853029">"प्राप्तकर्ता"</item>
- <item msgid="6782857406100845127">"मुख्यपृष्ठ"</item>
- <item msgid="2860945127596974299">"अंतिम क्रियाकलाप"</item>
- <item msgid="8610560843693675830">"कॅश केलेला (क्रियाकलाप)"</item>
- <item msgid="4338089220026248848">"कॅश केलेला (क्रियाकलाप क्लायंट)"</item>
+ <item msgid="6782857406100845127">"होम"</item>
+ <item msgid="2860945127596974299">"शेवटच्या अॅक्टिव्हिटी"</item>
+ <item msgid="8610560843693675830">"कॅशे केलेली (अॅक्टिव्हिटी)"</item>
+ <item msgid="4338089220026248848">"कॅशे केलेला (अॅक्टिव्हिटी क्लायंट)"</item>
<item msgid="6652164677254579050">"कॅश केलेला (रिक्त)"</item>
</string-array>
<string-array name="color_picker">
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 7a8f67a..c5d6f50 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -413,7 +413,7 @@
<item msgid="758587126802411846">"အဖြူပေါ်အမည်း"</item>
<item msgid="1495307195241623402">"အမည်းပေါ်အဝါ"</item>
<item msgid="6039700130994371612">"အပြာပေါ်အဝါ"</item>
- <item msgid="7169235156349580064">"မိမိစိတ်ကြိုက်"</item>
+ <item msgid="7169235156349580064">"စိတ်ကြိုက်"</item>
</string-array>
<string-array name="vpn_types_long">
<item msgid="2732002039459078847">"PPTP VPN"</item>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index bc69218..3fb9662 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -84,7 +84,7 @@
<item msgid="8878186979715711006">"ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</item>
<item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</item>
<item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਕਰ ਰਿਹਾ ਹੈ…"</item>
- <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਤੋਂ IP ਪਤਾ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ…"</item>
+ <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਤੋਂ IP ਪਤਾ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</item>
<item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</item>
<item msgid="1330262655415760617">"ਮੁਅੱਤਲ ਕੀਤਾ"</item>
<item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਤੋਂ ਡਿਸਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</item>
@@ -122,8 +122,8 @@
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"ਪੁਸ਼ ਬਟਨ"</item>
- <item msgid="1624323946324499595">"ਪੀਅਰ ਡੀਵਾਈਸ ਦਾ PIN"</item>
- <item msgid="5366790421523328066">"ਇਸ ਡੀਵਾਈਸ ਤੋਂ PIN"</item>
+ <item msgid="1624323946324499595">"ਪੀਅਰ ਡੀਵਾਈਸ ਤੋਂ ਪਿੰਨ"</item>
+ <item msgid="5366790421523328066">"ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਪਿੰਨ"</item>
</string-array>
<string-array name="wifi_p2p_status">
<item msgid="1701505390737218306">"ਕਨੈਕਟ ਕੀਤਾ"</item>
@@ -234,7 +234,7 @@
<item msgid="255608127647030286">"ਨਿੱਜੀ"</item>
<item msgid="4588829735729884491">"ਮੈਸੇਂਜ਼ਿੰਗ"</item>
<item msgid="886742181977884584">"ਮੀਡੀਆ"</item>
- <item msgid="7924928667052300589">"ਡੀਵਾਈਸ:"</item>
+ <item msgid="7924928667052300589">"ਡੀਵਾਈਸ"</item>
</string-array>
<string-array name="app_ops_summaries">
<item msgid="4979188868761515915">"ਕੋਰਸ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</item>
@@ -247,14 +247,14 @@
<item msgid="6546959730920410907">"ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</item>
<item msgid="446877710771379667">"ਕੈਲੰਡਰ ਪੜ੍ਹੋ"</item>
<item msgid="7674458294386319722">"ਕੈਲੰਡਰ ਸੰਸ਼ੋਧਿਤ ਕਰੋੇ"</item>
- <item msgid="8281201165558093009">"wi-fi ਸਕੈਨ"</item>
+ <item msgid="8281201165558093009">"ਵਾਈ-ਫਾਈ ਸਕੈਨ"</item>
<item msgid="8694611243479480497">"ਸੂਚਨਾ"</item>
<item msgid="7776439107987345446">"ਸੈਲ ਸਕੈਨ"</item>
- <item msgid="514615766544675057">"ਫੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
+ <item msgid="514615766544675057">"ਫ਼ੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
<item msgid="8181415497109310680">"SMS ਪੜ੍ਹੋ"</item>
<item msgid="6816551144382117307">"SMS ਲਿਖੋ"</item>
<item msgid="4600463921908905030">"SMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
- <item msgid="5958926493289432745">"ਐਮਰਜੈਂਸੀ SMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
+ <item msgid="5958926493289432745">"ਸੰਕਟਕਾਲੀਨ SMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
<item msgid="4945269495221089540">"MMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
<item msgid="5570472453573929087">"WAP ਪੁਸ਼ ਪ੍ਰਾਪਤ ਕਰੋ"</item>
<item msgid="7125408150230860501">"SMS ਭੇਜੋ"</item>
@@ -264,17 +264,17 @@
<item msgid="1545733463471924009">"ਟੌਪ ਤੇ ਡ੍ਰਾ ਕਰੋ"</item>
<item msgid="3609046903962454582">"ਪਹੁੰਚ ਸੂਚਨਾਵਾਂ"</item>
<item msgid="4671646036128214513">"ਕੈਮਰਾ"</item>
- <item msgid="1097324338692486211">"ਔਡੀਓ ਰਿਕਾਰਡ ਕਰੋ"</item>
- <item msgid="5031552983987798163">"ਔਡੀਓ ਪਲੇ ਕਰੋ"</item>
+ <item msgid="1097324338692486211">" ਆਡੀਓ ਰਿਕਾਰਡ ਕਰੋ"</item>
+ <item msgid="5031552983987798163">" ਆਡੀਓ ਪਲੇ ਕਰੋ"</item>
<item msgid="8374996688066472414">"ਕਲਿਪਬੋਰਡ ਪੜ੍ਹੋ"</item>
<item msgid="3045529469061083747">"ਕਲਿਪਬੋਰਡ ਬਦਲੋ"</item>
<item msgid="5124443975763747838">"ਮੀਡੀਆ ਬਟਨ"</item>
- <item msgid="4547883971364273343">"ਔਡੀਓ ਫੋਕਸ"</item>
+ <item msgid="4547883971364273343">" ਆਡੀਓ ਫੋਕਸ"</item>
<item msgid="2603878814882344450">"ਮਾਸਟਰ ਵੌਲਿਊਮ"</item>
<item msgid="7136963238377062018">"ਅਵਾਜ਼ ਵੋਲਯੂਮ"</item>
- <item msgid="4270236897655923007">"ਰਿੰਗ ਵੌਲਿਊਮ"</item>
- <item msgid="6325739889222559394">"ਮੀਡੀਆ ਵੌਲਿਊਮ"</item>
- <item msgid="5762123934816216821">"ਅਲਾਰਮ ਵੌਲਿਊਮ"</item>
+ <item msgid="4270236897655923007">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼"</item>
+ <item msgid="6325739889222559394">"ਮੀਡੀਆ ਦੀ ਅਵਾਜ਼"</item>
+ <item msgid="5762123934816216821">"ਅਲਾਰਮ ਦੀ ਅਵਾਜ਼"</item>
<item msgid="785049718065337473">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</item>
<item msgid="6700305533746877052">"bluetooth ਵੌਲਿਊਮ"</item>
<item msgid="2029227495214047094">"ਸਕਿਰਿਆ ਰੱਖੋ"</item>
@@ -282,13 +282,13 @@
<item msgid="5753382310468855812">"ਉੱਚ ਪਾਵਰ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਨਿਰੀਖਣ ਕਰੋ"</item>
<item msgid="3356591542543137332">"ਵਰਤੋਂ ਸਟੈਟਸ ਪ੍ਰਾਪਤ ਕਰੋ"</item>
<item msgid="3073734345226842233">"ਮਾਈਕ੍ਰੋਫੋਨ ਨੂੰ ਮਿਊਟ/ਅਨਮਿਊਟ ਕਰੋ"</item>
- <item msgid="2111767435887685265">"ਟੋਸਟ ਵਿਖਾਓ"</item>
+ <item msgid="2111767435887685265">"ਟੋਸਟ ਦਿਖਾਓ"</item>
<item msgid="1091168669714823370">"ਪ੍ਰੋਜੈਕਟ ਮੀਡੀਆ"</item>
<item msgid="485564189219029300">"VPN ਨੂੰ ਸਰਗਰਮ ਕਰੋ"</item>
<item msgid="7155384795265164395">"ਵਾਲਪੇਪਰ ਲਿਖੋ"</item>
<item msgid="1835836196806147034">"ਸਹਾਇਕ ਬਣਤਰ"</item>
<item msgid="5989890403088155055">"ਸਹਾਇਕ ਸਕਰੀਨਸ਼ਾਟ"</item>
- <item msgid="8582699692765917557">"ਫੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
+ <item msgid="8582699692765917557">"ਫ਼ੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
<item msgid="1474039653814954902">"ਵੌਇਸਮੇਲ ਸ਼ਾਮਲ ਕਰੋ"</item>
<item msgid="7222837656938871633">"SIP ਵਰਤੋ"</item>
<item msgid="6108267038969274380">"ਆਊਟਗੋਇੰਗ ਕਾਲ \'ਤੇ ਪ੍ਰਕਿਰਿਆ ਕਰੋ"</item>
@@ -301,7 +301,7 @@
<item msgid="6628873315024166197">"ਸਕਰੀਨ ਚਾਲੂ ਕਰੋ"</item>
<item msgid="3253368931113490863">"ਖਾਤੇ ਲਓ"</item>
<item msgid="780392378084812901">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚਲਾਓ"</item>
- <item msgid="2629748510881309577">"ਪਹੁੰਚਯੋਗਤਾ ਵੌਲਿਊਮ"</item>
+ <item msgid="2629748510881309577">"ਪਹੁੰਚਯੋਗਤਾ ਅਵਾਜ਼"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"ਟਿਕਾਣਾ"</item>
@@ -317,7 +317,7 @@
<item msgid="1638204101698708656">"ਟਿਕਾਣਾ"</item>
<item msgid="2154671955760380322">"ਸੂਚਨਾ ਪੋਸਟ ਕਰੋ"</item>
<item msgid="4282477730595931828">"ਟਿਕਾਣਾ"</item>
- <item msgid="4891423912898525905">"ਫੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
+ <item msgid="4891423912898525905">"ਫ਼ੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
<item msgid="2623604824935968113">"SMS/MMS ਪੜ੍ਹੋ"</item>
<item msgid="4420177125221176306">"SMS/MMS ਲਿਖੋ"</item>
<item msgid="3986142739951490025">"SMS/MMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
@@ -331,17 +331,17 @@
<item msgid="736541391767350377">"ਟੌਪ ਤੇ ਡ੍ਰਾ ਕਰੋ"</item>
<item msgid="5530815681721654194">"ਪਹੁੰਚ ਸੂਚਨਾਵਾਂ"</item>
<item msgid="781213371706962767">"ਕੈਮਰਾ"</item>
- <item msgid="1720492593061838172">"ਔਡੀਓ ਰਿਕਾਰਡ ਕਰੋ"</item>
- <item msgid="3493046322001257041">"ਔਡੀਓ ਪਲੇ ਕਰੋ"</item>
+ <item msgid="1720492593061838172">" ਆਡੀਓ ਰਿਕਾਰਡ ਕਰੋ"</item>
+ <item msgid="3493046322001257041">" ਆਡੀਓ ਪਲੇ ਕਰੋ"</item>
<item msgid="136815868796597058">"ਕਲਿਪਬੋਰਡ ਪੜ੍ਹੋ"</item>
<item msgid="5238692940326972503">"ਕਲਿਪਬੋਰਡ ਬਦਲੋ"</item>
<item msgid="5753789168376302997">"ਮੀਡੀਆ ਬਟਨ"</item>
- <item msgid="3265262911688671938">"ਔਡੀਓ ਫੋਕਸ"</item>
+ <item msgid="3265262911688671938">" ਆਡੀਓ ਫੋਕਸ"</item>
<item msgid="2098976479485046797">"ਮਾਸਟਰ ਵੌਲਿਊਮ"</item>
<item msgid="5660213838861789350">"ਵੌਇਸ ਵੌਲਿਊਮ"</item>
- <item msgid="7983336752371254444">"ਰਿੰਗ ਵੌਲਿਊਮ"</item>
- <item msgid="7878027809189330917">"ਮੀਡੀਆ ਵੌਲਿਊਮ"</item>
- <item msgid="7260546305036218513">"ਅਲਾਰਮ ਵੌਲਿਊਮ"</item>
+ <item msgid="7983336752371254444">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼"</item>
+ <item msgid="7878027809189330917">"ਮੀਡੀਆ ਦੀ ਅਵਾਜ਼"</item>
+ <item msgid="7260546305036218513">"ਅਲਾਰਮ ਦੀ ਅਵਾਜ਼"</item>
<item msgid="9103719301075748925">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</item>
<item msgid="7025966722295861512">"Bluetooth ਵੌਲਿਊਮ"</item>
<item msgid="4665183401128289653">"ਸਕਿਰਿਆ ਰੱਖੋ"</item>
@@ -349,13 +349,13 @@
<item msgid="7669257279311110599">"ਟਿਕਾਣਾ"</item>
<item msgid="3459320345690097795">"ਵਰਤੋਂ ਸਟੈਟਸ ਪ੍ਰਾਪਤ ਕਰੋ"</item>
<item msgid="1312534577834048535">"ਮਾਈਕ੍ਰੋਫੋਨ ਨੂੰ ਮਿਊਟ/ਅਨਮਿਊਟ ਕਰੋ"</item>
- <item msgid="427580389823724225">"ਟੋਸਟ ਵਿਖਾਓ"</item>
+ <item msgid="427580389823724225">"ਟੋਸਟ ਦਿਖਾਓ"</item>
<item msgid="4992007785575926253">"ਪ੍ਰੋਜੈਕਟ ਮੀਡੀਆ"</item>
<item msgid="2482631530338029480">"VPN ਨੂੰ ਸਰਗਰਮ ਕਰੋ"</item>
<item msgid="1662979573471871926">"ਵਾਲਪੇਪਰ ਲਿਖੋ"</item>
<item msgid="5964768335278263478">"ਸਹਾਇਕ ਬਣਤਰ"</item>
<item msgid="2657138701132782702">"ਸਹਾਇਕ ਸਕਰੀਨਸ਼ਾਟ"</item>
- <item msgid="8571369610363539266">"ਫੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
+ <item msgid="8571369610363539266">"ਫ਼ੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
<item msgid="4542463358215230845">"ਵੌਇਸਮੇਲ ਸ਼ਾਮਲ ਕਰੋ"</item>
<item msgid="864565065016166003">"SIP ਵਰਤੋ"</item>
<item msgid="1958009349883195116">"ਆਊਟਗੋਇੰਗ ਕਾਲ \'ਤੇ ਪ੍ਰਕਿਰਿਆ ਕਰੋ"</item>
@@ -368,7 +368,7 @@
<item msgid="5832543806893763620">"ਸਕਰੀਨ ਚਾਲੂ ਕਰੋ"</item>
<item msgid="5258373962467495905">"ਖਾਤੇ ਲਓ"</item>
<item msgid="334625385979270703">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚਲਾਓ"</item>
- <item msgid="9039213578110332702">"ਪਹੁੰਚਯੋਗਤਾ ਵੌਲਿਊਮ"</item>
+ <item msgid="9039213578110332702">"ਪਹੁੰਚਯੋਗਤਾ ਅਵਾਜ਼"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"ਘੱਟ"</item>
@@ -413,7 +413,7 @@
<item msgid="758587126802411846">"ਸਫ਼ੈਦ \'ਤੇ ਕਾਲਾ"</item>
<item msgid="1495307195241623402">"ਕਾਲੇ \'ਤੇ ਪੀਲਾ"</item>
<item msgid="6039700130994371612">"ਨੀਲੇ \'ਤੇ ਪੀਲਾ"</item>
- <item msgid="7169235156349580064">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ"</item>
+ <item msgid="7169235156349580064">"ਵਿਉਂਂਤੀ"</item>
</string-array>
<string-array name="vpn_types_long">
<item msgid="2732002039459078847">"PPTP VPN"</item>
@@ -454,7 +454,7 @@
<item msgid="5779398140277006695">"ਟੌਪ ਗਤੀਵਿਧੀ"</item>
<item msgid="1439598363694578255">"ਮਹੱਤਵਪੂਰਣ (ਫੋਰਗ੍ਰਾਉਂਡ)"</item>
<item msgid="3396458970745718652">"ਮਹੱਤਵਪੂਰਣ (ਪਿਛੋਕੜ)"</item>
- <item msgid="5214825238247511992">"ਬੈਕਅਪ ਕਰੋ"</item>
+ <item msgid="5214825238247511992">"ਬੈਕਅੱਪ"</item>
<item msgid="311372689168254967">"ਹੈਵੀ ਵੇਟ"</item>
<item msgid="7438189122367820362">"ਸੇਵਾ (ਚੱਲ ਰਹੀ ਹੈ)"</item>
<item msgid="918687422516982498">"ਸੇਵਾ (ਰੀਸਟਾਰਟ ਕਰ ਰਿਹਾ ਹੈ)"</item>
@@ -462,7 +462,7 @@
<item msgid="6782857406100845127">"ਹੋਮ"</item>
<item msgid="2860945127596974299">"ਪਿਛਲੀ ਗਤੀਵਿਧੀ"</item>
<item msgid="8610560843693675830">"ਕੈਚ ਕੀਤੀ (ਗਤੀਵਿਧੀ)"</item>
- <item msgid="4338089220026248848">"ਕੈਚ ਕੀਤੀ (ਗਤੀਵਿਧੀ ਕਲਾਈਂਟ)"</item>
+ <item msgid="4338089220026248848">"ਕੈਸ਼ ਕੀਤੀ (ਗਤੀਵਿਧੀ ਕਲਾਇੰਟ)"</item>
<item msgid="6652164677254579050">"ਕੈਚ ਕੀਤੀ (ਖਾਲੀ)"</item>
</string-array>
<string-array name="color_picker">
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 90cc3ec..43a1033 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -247,7 +247,7 @@
<item msgid="6546959730920410907">"úprava denníka hovorov"</item>
<item msgid="446877710771379667">"čítanie kalendára"</item>
<item msgid="7674458294386319722">"úprava kalendára"</item>
- <item msgid="8281201165558093009">"prehľadanie sietí Wi-Fi"</item>
+ <item msgid="8281201165558093009">"prehľadanie sietí Wi‑Fi"</item>
<item msgid="8694611243479480497">"upozornenie"</item>
<item msgid="7776439107987345446">"prehľadanie mobilných sietí"</item>
<item msgid="514615766544675057">"volanie na telefón"</item>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 3a04de1..087da45 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -232,7 +232,7 @@
<string-array name="app_ops_categories">
<item msgid="6358963769537892925">"Eneo"</item>
<item msgid="255608127647030286">"Binafsi"</item>
- <item msgid="4588829735729884491">"Utumaji ujumbe"</item>
+ <item msgid="4588829735729884491">"Kutuma ujumbe"</item>
<item msgid="886742181977884584">"Vyombo vya Habari"</item>
<item msgid="7924928667052300589">"Kifaa"</item>
</string-array>
@@ -273,7 +273,7 @@
<item msgid="2603878814882344450">"sauti kuu"</item>
<item msgid="7136963238377062018">"kiwango cha sauti"</item>
<item msgid="4270236897655923007">"sauti ya mlio"</item>
- <item msgid="6325739889222559394">"sauti ya midia"</item>
+ <item msgid="6325739889222559394">"sauti ya faili"</item>
<item msgid="5762123934816216821">"sauti ya kengele"</item>
<item msgid="785049718065337473">"sauti ya arifa"</item>
<item msgid="6700305533746877052">"sauti ya bluetooth"</item>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index e9fe8f7..9a20a6f 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -293,7 +293,7 @@
<item msgid="7222837656938871633">"sipஐப் பயன்படுத்து"</item>
<item msgid="6108267038969274380">"வெளிச்செல்லும் அழைப்பைச் செயலாக்கு"</item>
<item msgid="4823402479973873358">"கைரேகை"</item>
- <item msgid="5895843015407713543">"உடல் உணர்விகள்"</item>
+ <item msgid="5895843015407713543">"உடல் சென்சார்கள்"</item>
<item msgid="1436446526955010826">"செல் பிராட்காஸ்ட்களைப் படி"</item>
<item msgid="884172201575690484">"போலியான இருப்பிடம்"</item>
<item msgid="3591971310048485247">"சேமிப்பகத்தைப் படி"</item>
@@ -360,7 +360,7 @@
<item msgid="864565065016166003">"sipஐப் பயன்படுத்து"</item>
<item msgid="1958009349883195116">"வெளிச்செல்லும் அழைப்பைச் செயலாக்கு"</item>
<item msgid="8526563410140613458">"கைரேகை"</item>
- <item msgid="7864822459293570891">"உடல் உணர்விகள்"</item>
+ <item msgid="7864822459293570891">"உடல் சென்சார்கள்"</item>
<item msgid="6798698496904810960">"செல் பிராட்காஸ்ட்களைப் படி"</item>
<item msgid="5242052845700875820">"போலியான இருப்பிடம்"</item>
<item msgid="1246296877820358565">"சேமிப்பகத்தைப் படி"</item>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index d0c965a..8835eaa 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -122,8 +122,8 @@
<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"పుష్ బటన్"</item>
- <item msgid="1624323946324499595">"పీర్ పరికరం నుండి పిన్"</item>
- <item msgid="5366790421523328066">"ఈ పరికరం నుండి పిన్"</item>
+ <item msgid="1624323946324499595">"పీర్ డివైజ్ నుండి పిన్"</item>
+ <item msgid="5366790421523328066">"ఈ డివైజ్ నుండి పిన్"</item>
</string-array>
<string-array name="wifi_p2p_status">
<item msgid="1701505390737218306">"కనెక్ట్ చేయబడింది"</item>
@@ -152,7 +152,7 @@
<string-array name="usage_stats_display_order_types">
<item msgid="2100172576767439288">"వినియోగ సమయం"</item>
<item msgid="4796160515314745154">"చివరిగా ఉపయోగించినది"</item>
- <item msgid="2502754479975776899">"అనువర్తనం పేరు"</item>
+ <item msgid="2502754479975776899">"యాప్ పేరు"</item>
</string-array>
<string-array name="wifi_eap_entries">
<item msgid="8615575908717909498">"PEAP"</item>
@@ -262,7 +262,7 @@
<item msgid="587124103118495063">"ICC SMSను వ్రాయండి"</item>
<item msgid="2320577158869025503">"సెట్టింగ్లను సవరించండి"</item>
<item msgid="1545733463471924009">"పైభాగంలో గీయండి"</item>
- <item msgid="3609046903962454582">"నోటిఫికేషన్లను ప్రాప్యత చేయండి"</item>
+ <item msgid="3609046903962454582">"నోటిఫికేషన్లను యాక్సెస్ చేయండి"</item>
<item msgid="4671646036128214513">"కెమెరా"</item>
<item msgid="1097324338692486211">"ఆడియోను రికార్డ్ చేయండి"</item>
<item msgid="5031552983987798163">"ఆడియో ప్లే చేయండి"</item>
@@ -301,7 +301,7 @@
<item msgid="6628873315024166197">"స్క్రీన్ను ఆన్ చేయడం"</item>
<item msgid="3253368931113490863">"ఖాతాలను పొందడం"</item>
<item msgid="780392378084812901">"నేపథ్యంలో అమలు చేయడం"</item>
- <item msgid="2629748510881309577">"ప్రాప్యత వాల్యూమ్"</item>
+ <item msgid="2629748510881309577">"యాక్సెస్ సామర్థ్య వాల్యూమ్"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"స్థానం"</item>
@@ -329,7 +329,7 @@
<item msgid="4370895547001583812">"SMS/MMSను వ్రాయండి"</item>
<item msgid="4218544235221631789">"సెట్టింగ్లను సవరించండి"</item>
<item msgid="736541391767350377">"పైభాగంలో గీయండి"</item>
- <item msgid="5530815681721654194">"నోటిఫికేషన్లను ప్రాప్యత చేయండి"</item>
+ <item msgid="5530815681721654194">"నోటిఫికేషన్లను యాక్సెస్ చేయండి"</item>
<item msgid="781213371706962767">"కెమెరా"</item>
<item msgid="1720492593061838172">"ఆడియోను రికార్డ్ చేయండి"</item>
<item msgid="3493046322001257041">"ఆడియో ప్లే చేయండి"</item>
@@ -368,7 +368,7 @@
<item msgid="5832543806893763620">"స్క్రీన్ను ఆన్ చేయడం"</item>
<item msgid="5258373962467495905">"ఖాతాలను పొందడం"</item>
<item msgid="334625385979270703">"నేపథ్యంలో అమలు చేయడం"</item>
- <item msgid="9039213578110332702">"ప్రాప్యత వాల్యూమ్"</item>
+ <item msgid="9039213578110332702">"యాక్సెస్ సామర్థ్య వాల్యూమ్"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"తక్కువ సేపు"</item>
@@ -451,7 +451,7 @@
</string-array>
<string-array name="proc_stats_process_states">
<item msgid="5069825997142785829">"స్థిరం"</item>
- <item msgid="5779398140277006695">"అధిక కార్యాచరణ"</item>
+ <item msgid="5779398140277006695">"ప్రముఖ కార్యకలాపం"</item>
<item msgid="1439598363694578255">"ముఖ్యం (ముందుభాగం)"</item>
<item msgid="3396458970745718652">"ముఖ్యం (నేపథ్యం)"</item>
<item msgid="5214825238247511992">"బ్యాకప్"</item>
@@ -460,9 +460,9 @@
<item msgid="918687422516982498">"సేవ (పునఃప్రారంభమవుతోంది)"</item>
<item msgid="6807727069641853029">"రిసీవర్"</item>
<item msgid="6782857406100845127">"హోమ్"</item>
- <item msgid="2860945127596974299">"చివరి కార్యాచరణ"</item>
- <item msgid="8610560843693675830">"కాష్ చేసినవి (కార్యాచరణ)"</item>
- <item msgid="4338089220026248848">"కాష్ చేసినవి (కార్యాచరణ క్లయింట్)"</item>
+ <item msgid="2860945127596974299">"చివరి కార్యకలాపం"</item>
+ <item msgid="8610560843693675830">"కాష్ చేసినవి (కార్యకలాపం)"</item>
+ <item msgid="4338089220026248848">"కాష్ చేసినవి (కార్యకలాపం క్లయింట్)"</item>
<item msgid="6652164677254579050">"కాష్ చేసినవి (ఖాళీ)"</item>
</string-array>
<string-array name="color_picker">
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 20f0141..571bf28 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -52,7 +52,7 @@
<item msgid="8929270399652145290">"Одразу"</item>
<item msgid="6736512735606834431">"5 секунд"</item>
<item msgid="8044619388267891375">"15 секунд"</item>
- <item msgid="1822002388249545488">"30 сек."</item>
+ <item msgid="1822002388249545488">"30 секунд"</item>
<item msgid="8538071621211916519">"1 хвилина"</item>
<item msgid="5663439580228932882">"2 хвилини"</item>
<item msgid="49888496216106852">"5 хвилин"</item>
@@ -476,6 +476,6 @@
<string-array name="automatic_storage_management_days">
<item msgid="687318592238852312">"Старіші за 30 днів"</item>
<item msgid="2900554746706302178">"Старіші за 60 днів"</item>
- <item msgid="5692284879054004388">"Старіші за 90 днів"</item>
+ <item msgid="5692284879054004388">"Додані понад 90 днів тому"</item>
</string-array>
</resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 27a2b63..e4b8637 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -474,8 +474,8 @@
<item msgid="6131821495505931173">"سرخ"</item>
</string-array>
<string-array name="automatic_storage_management_days">
- <item msgid="687318592238852312">"30 دن سے زیادہ پرانا"</item>
- <item msgid="2900554746706302178">"60 دن سے زیادہ پرانا"</item>
- <item msgid="5692284879054004388">"90 دن سے زیادہ پرانا"</item>
+ <item msgid="687318592238852312">"30 دن سے زیادہ پرانی"</item>
+ <item msgid="2900554746706302178">"60 دن سے زیادہ پرانی"</item>
+ <item msgid="5692284879054004388">"90 دن سے زیادہ پرانی"</item>
</string-array>
</resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index ba1fe3a..a29d2b8 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -67,7 +67,7 @@
</string-array>
<string-array name="wifi_status">
<item msgid="1922181315419294640"></item>
- <item msgid="8934131797783724664">"掃瞄中…"</item>
+ <item msgid="8934131797783724664">"掃描中…"</item>
<item msgid="8513729475867537913">"正在連線..."</item>
<item msgid="515055375277271756">"正在驗證…"</item>
<item msgid="1943354004029184381">"正在取得 IP 位址…"</item>
@@ -81,7 +81,7 @@
</string-array>
<string-array name="wifi_status_with_ssid">
<item msgid="7714855332363650812"></item>
- <item msgid="8878186979715711006">"掃瞄中…"</item>
+ <item msgid="8878186979715711006">"掃描中…"</item>
<item msgid="355508996603873860">"正在連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
<item msgid="554971459996405634">"正在取得 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的授權…"</item>
<item msgid="7928343808033020343">"正在從 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 取得 IP 位址…"</item>
@@ -247,9 +247,9 @@
<item msgid="6546959730920410907">"修改通話記錄"</item>
<item msgid="446877710771379667">"讀取日曆"</item>
<item msgid="7674458294386319722">"修改日曆"</item>
- <item msgid="8281201165558093009">"Wi-Fi 掃瞄"</item>
+ <item msgid="8281201165558093009">"Wi-Fi 掃描"</item>
<item msgid="8694611243479480497">"通知"</item>
- <item msgid="7776439107987345446">"手機掃瞄"</item>
+ <item msgid="7776439107987345446">"手機掃描"</item>
<item msgid="514615766544675057">"撥打電話"</item>
<item msgid="8181415497109310680">"讀取 SMS"</item>
<item msgid="6816551144382117307">"寫入 SMS"</item>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 147c5bc..ecfa5a8 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -270,6 +270,14 @@
android:entries="@array/bluetooth_a2dp_codec_ldac_playback_quality_titles"
android:entryValues="@array/bluetooth_a2dp_codec_ldac_playback_quality_values" />
+ <com.android.settings.development.PrivateDnsModeDialogPreference
+ android:key="select_private_dns_configuration"
+ android:title="@string/select_private_dns_configuration_title"
+ android:dialogTitle="@string/select_private_dns_configuration_dialog_title"
+ android:dialogLayout="@layout/private_dns_mode_dialog"
+ android:positiveButtonText="@string/save"
+ android:negativeButtonText="@string/cancel" />
+
</PreferenceCategory>
<PreferenceCategory android:key="debug_input_category"
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 3e139e1..0517b13 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -30,10 +30,12 @@
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.EditText;
import android.widget.ListView;
import android.widget.TabHost;
import android.widget.TabHost.OnTabChangeListener;
@@ -78,6 +80,7 @@
private static final String DIALOG_PIN = "dialogPin";
private static final String DIALOG_ERROR = "dialogError";
private static final String ENABLE_TO_STATE = "enableState";
+ private static final String CURRENT_TAB = "currentTab";
// Save and restore inputted PIN code when configuration changed
// (ex. portrait<-->landscape) during change PIN code
@@ -233,6 +236,10 @@
mPhone = (sir == null) ? null
: PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId()));
+
+ if (savedInstanceState != null && savedInstanceState.containsKey(CURRENT_TAB)) {
+ mTabHost.setCurrentTabByTag(savedInstanceState.getString(CURRENT_TAB));
+ }
return view;
} else {
mPhone = PhoneFactory.getDefaultPhone();
@@ -324,6 +331,10 @@
} else {
super.onSaveInstanceState(out);
}
+
+ if (mTabHost != null) {
+ out.putString(CURRENT_TAB, mTabHost.getCurrentTabTag());
+ }
}
private void showPinDialog() {
@@ -333,6 +344,11 @@
setDialogValues();
mPinDialog.showPinDialog();
+
+ final EditText editText = mPinDialog.getEditText();
+ if (!TextUtils.isEmpty(mPin) && editText != null) {
+ editText.setSelection(mPin.length());
+ }
}
private void setDialogValues() {
diff --git a/src/com/android/settings/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java
index 18cfb8e..3128dfe 100644
--- a/src/com/android/settings/OwnerInfoSettings.java
+++ b/src/com/android/settings/OwnerInfoSettings.java
@@ -67,6 +67,7 @@
mOwnerInfo = (EditText) mView.findViewById(R.id.owner_info_edit_text);
if (!TextUtils.isEmpty(info)) {
mOwnerInfo.setText(info);
+ mOwnerInfo.setSelection(info.length());
}
}
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index a44e182..e547570 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -63,7 +63,6 @@
@VisibleForTesting
static final String DATA_MANAGEMENT = "data_management";
private static final String BACKUP_INACTIVE = "backup_inactive";
- private static final String FACTORY_RESET = "factory_reset";
private static final String TAG = "PrivacySettings";
private IBackupManager mBackupManager;
private Preference mBackup;
@@ -245,9 +244,5 @@
nonVisibleKeys.add(AUTO_RESTORE);
nonVisibleKeys.add(CONFIGURE_ACCOUNT);
}
- if (RestrictedLockUtils.hasBaseUserRestriction(context,
- UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
- nonVisibleKeys.add(FACTORY_RESET);
- }
}
}
diff --git a/src/com/android/settings/datetime/ZonePicker.java b/src/com/android/settings/datetime/ZonePicker.java
index 2d58dd8..87f2b75 100644
--- a/src/com/android/settings/datetime/ZonePicker.java
+++ b/src/com/android/settings/datetime/ZonePicker.java
@@ -22,6 +22,7 @@
import android.app.ListFragment;
import android.content.Context;
import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -38,6 +39,7 @@
import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.datetime.ZoneGetter;
+import java.text.Collator;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
@@ -257,15 +259,21 @@
mVisibilityLoggerMixin.onPause();
}
- private static class MyComparator implements Comparator<Map<?, ?>> {
+ @VisibleForTesting
+ static class MyComparator implements Comparator<Map<?, ?>> {
+ private final Collator mCollator;
private String mSortingKey;
+ private boolean mSortedByName;
public MyComparator(String sortingKey) {
+ mCollator = Collator.getInstance();
mSortingKey = sortingKey;
+ mSortedByName = ZoneGetter.KEY_DISPLAY_LABEL.equals(sortingKey);
}
public void setSortingKey(String sortingKey) {
mSortingKey = sortingKey;
+ mSortedByName = ZoneGetter.KEY_DISPLAY_LABEL.equals(sortingKey);
}
public int compare(Map<?, ?> map1, Map<?, ?> map2) {
@@ -282,7 +290,11 @@
return -1;
}
- return ((Comparable) value1).compareTo(value2);
+ if (mSortedByName) {
+ return mCollator.compare(value1, value2);
+ } else {
+ return ((Comparable) value1).compareTo(value2);
+ }
}
private boolean isComparable(Object value) {
diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index ae271ff..ffc5598 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -223,6 +223,8 @@
private static final String BLUETOOTH_SELECT_A2DP_CHANNEL_MODE_KEY = "bluetooth_select_a2dp_channel_mode";
private static final String BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY = "bluetooth_select_a2dp_ldac_playback_quality";
+ private static final String PRIVATE_DNS_PREF_KEY = "select_private_dns_configuration";
+
private static final String INACTIVE_APPS_KEY = "inactive_apps";
private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY
@@ -525,6 +527,8 @@
mBluetoothSelectA2dpLdacPlaybackQuality = addListPreference(BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY);
initBluetoothConfigurationValues();
+ updatePrivateDnsSummary();
+
mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);
mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
@@ -856,6 +860,7 @@
updateBluetoothDisableAbsVolumeOptions();
updateBluetoothEnableInbandRingingOptions();
updateBluetoothA2dpConfigurationValues();
+ updatePrivateDnsSummary();
}
private void resetDangerousOptions() {
@@ -2234,6 +2239,13 @@
}
}
+ private void updatePrivateDnsSummary() {
+ final String summary = PrivateDnsModeDialogPreference.getSummaryStringForModeFromSettings(
+ getActivity().getContentResolver(), getActivity().getResources());
+ final Preference pref = findPreference(PRIVATE_DNS_PREF_KEY);
+ pref.setSummary(summary);
+ }
+
private void writeImmediatelyDestroyActivitiesOptions() {
try {
ActivityManager.getService().setAlwaysFinish(
diff --git a/src/com/android/settings/development/PrivateDnsModeDialogPreference.java b/src/com/android/settings/development/PrivateDnsModeDialogPreference.java
new file mode 100644
index 0000000..ee44b08
--- /dev/null
+++ b/src/com/android/settings/development/PrivateDnsModeDialogPreference.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.development;
+
+import static android.net.ConnectivityManager.PRIVATE_DNS_DEFAULT_MODE;
+import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
+import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
+import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.v14.preference.PreferenceDialogFragment;
+import android.support.v7.preference.DialogPreference;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.inputmethod.EditorInfo;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup.LayoutParams;
+import android.view.ViewGroup.MarginLayoutParams;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
+
+import com.android.settings.R;
+import com.android.settingslib.CustomDialogPreference;
+
+
+public class PrivateDnsModeDialogPreference extends CustomDialogPreference
+ implements OnCheckedChangeListener, TextWatcher, OnEditorActionListener {
+ private static final String TAG = PrivateDnsModeDialogPreference.class.getSimpleName();
+
+ private static final String MODE_KEY = Settings.Global.PRIVATE_DNS_MODE;
+ private static final String HOSTNAME_KEY = Settings.Global.PRIVATE_DNS_SPECIFIER;
+ private String mMode;
+ private EditText mEditText;
+
+ public static String getSummaryStringForModeFromSettings(ContentResolver cr, Resources res) {
+ final String mode = getModeFromSettings(cr);
+ switch (mode) {
+ case PRIVATE_DNS_MODE_OFF:
+ return res.getString(R.string.private_dns_mode_off);
+ case PRIVATE_DNS_MODE_OPPORTUNISTIC:
+ return res.getString(R.string.private_dns_mode_opportunistic);
+ case PRIVATE_DNS_MODE_PROVIDER_HOSTNAME:
+ return getHostnameFromSettings(cr);
+ default:
+ return "unknown";
+ }
+ }
+
+ public PrivateDnsModeDialogPreference(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ }
+
+ public PrivateDnsModeDialogPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ public PrivateDnsModeDialogPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public PrivateDnsModeDialogPreference(Context context) {
+ super(context);
+ }
+
+ // This is called first when the dialog is launched.
+ @Override
+ protected void onBindDialogView(View view) {
+ final String mode = getModeFromSettings();
+
+ RadioButton rb = (RadioButton) view.findViewById(R.id.private_dns_mode_off);
+ if (mode.equals(PRIVATE_DNS_MODE_OFF)) rb.setChecked(true);
+ rb.setOnCheckedChangeListener(this);
+
+ rb = (RadioButton) view.findViewById(R.id.private_dns_mode_opportunistic);
+ if (mode.equals(PRIVATE_DNS_MODE_OPPORTUNISTIC)) rb.setChecked(true);
+ rb.setOnCheckedChangeListener(this);
+
+ rb = (RadioButton) view.findViewById(R.id.private_dns_mode_provider);
+ if (mode.equals(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME)) rb.setChecked(true);
+ rb.setOnCheckedChangeListener(this);
+
+ mEditText = (EditText) view.findViewById(R.id.private_dns_mode_provider_hostname);
+ mEditText.setOnEditorActionListener(this);
+ mEditText.addTextChangedListener(this);
+
+ // (Mostly) Fix the EditText field's indentation to align underneath the
+ // displayed radio button text, and not under the radio button itself.
+ final int padding = rb.isLayoutRtl()
+ ? rb.getCompoundPaddingRight()
+ : rb.getCompoundPaddingLeft();
+ final MarginLayoutParams marginParams = (MarginLayoutParams) mEditText.getLayoutParams();
+ marginParams.setMarginStart(marginParams.getMarginStart() + padding);
+ mEditText.setLayoutParams(marginParams);
+ mEditText.setText(getHostnameFromSettings());
+
+ setDialogValue(mode);
+ }
+
+ @Override
+ protected void onDialogClosed(boolean positiveResult) {
+ if (!positiveResult) return;
+
+ saveDialogValue();
+ setSummary(getSummaryStringForModeFromSettings(
+ getContext().getContentResolver(), getContext().getResources()));
+ }
+
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (!isChecked) return;
+
+ switch (buttonView.getId()) {
+ case R.id.private_dns_mode_off:
+ setDialogValue(PRIVATE_DNS_MODE_OFF);
+ break;
+ case R.id.private_dns_mode_opportunistic:
+ setDialogValue(PRIVATE_DNS_MODE_OPPORTUNISTIC);
+ break;
+ case R.id.private_dns_mode_provider:
+ setDialogValue(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME);
+ break;
+ default:
+ // Unknown button; ignored.
+ break;
+ }
+ }
+
+ @Override
+ public boolean onEditorAction(TextView tv, int actionId, KeyEvent k) {
+ if (actionId == EditorInfo.IME_ACTION_DONE) {
+ saveDialogValue();
+ getDialog().dismiss();
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) { return; }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) { return; }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ final String hostname = s.toString();
+ final boolean appearsValid = isWeaklyValidatedHostname(hostname);
+ // TODO: Disable the "positive button" ("Save") when appearsValid is false.
+ }
+
+ private void setDialogValue(String mode) {
+ mMode = mode;
+ final boolean txtEnabled = mMode.equals(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME);
+ mEditText.setEnabled(txtEnabled);
+ }
+
+ private void saveDialogValue() {
+ if (!isValidMode(mMode)) {
+ mMode = PRIVATE_DNS_DEFAULT_MODE;
+ }
+
+ if (mMode.equals(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME)) {
+ final String hostname = mEditText.getText().toString();
+ if (isWeaklyValidatedHostname(hostname)) {
+ saveHostnameToSettings(hostname);
+ } else {
+ // TODO: Once quasi-validation of hostnames works and acceptable
+ // user signaling is working, this can be deleted.
+ mMode = PRIVATE_DNS_MODE_OPPORTUNISTIC;
+ if (TextUtils.isEmpty(hostname)) saveHostnameToSettings("");
+ }
+ }
+
+ saveModeToSettings(mMode);
+ }
+
+ private String getModeFromSettings() {
+ return getModeFromSettings(getContext().getContentResolver());
+ }
+
+ private void saveModeToSettings(String value) {
+ Settings.Global.putString(getContext().getContentResolver(), MODE_KEY, value);
+ }
+
+ private String getHostnameFromSettings() {
+ return getHostnameFromSettings(getContext().getContentResolver());
+ }
+
+ private void saveHostnameToSettings(String hostname) {
+ Settings.Global.putString(getContext().getContentResolver(), HOSTNAME_KEY, hostname);
+ }
+
+ private static String getModeFromSettings(ContentResolver cr) {
+ final String mode = Settings.Global.getString(cr, MODE_KEY);
+ return isValidMode(mode) ? mode : PRIVATE_DNS_DEFAULT_MODE;
+ }
+
+ private static boolean isValidMode(String mode) {
+ return !TextUtils.isEmpty(mode) && (
+ mode.equals(PRIVATE_DNS_MODE_OFF) ||
+ mode.equals(PRIVATE_DNS_MODE_OPPORTUNISTIC) ||
+ mode.equals(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME));
+ }
+
+ private static String getHostnameFromSettings(ContentResolver cr) {
+ return Settings.Global.getString(cr, HOSTNAME_KEY);
+ }
+
+ private static boolean isWeaklyValidatedHostname(String hostname) {
+ // TODO: Find and use a better validation method. Specifically:
+ // [1] this should reject IP string literals, and
+ // [2] do the best, simplest, future-proof verification that
+ // the input approximates a DNS hostname.
+ final String WEAK_HOSTNAME_REGEX = "^[a-zA-Z0-9_.-]+$";
+ return hostname.matches(WEAK_HOSTNAME_REGEX);
+ }
+}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index bef2e9a..ec055f1 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -450,6 +450,10 @@
private void onUserCreated(int userId) {
mAddedUserId = userId;
mAddingUser = false;
+ if (!isResumed()) {
+ Log.w(TAG, "Cannot show dialog after onPause");
+ return;
+ }
if (mUserManager.getUserInfo(userId).isRestricted()) {
showDialog(DIALOG_SETUP_PROFILE);
} else {
diff --git a/tests/app/res/values-hi/strings.xml b/tests/app/res/values-hi/strings.xml
index ed366ca..3a754c6 100644
--- a/tests/app/res/values-hi/strings.xml
+++ b/tests/app/res/values-hi/strings.xml
@@ -16,8 +16,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="discoverable" msgid="5156521178072363663">"खोजे जाने योग्य"</string>
- <string name="start_scan" msgid="3834980997400324437">"स्कैन प्रारंभ करें"</string>
+ <string name="discoverable" msgid="5156521178072363663">"खोजे जाने लायक"</string>
+ <string name="start_scan" msgid="3834980997400324437">"स्कैन शुरू करें"</string>
<string name="stop_scan" msgid="4195720269023182612">"स्कैन बंद करें"</string>
<string name="operator_hello" msgid="5164036004953019483">"नमस्कार ऑपरेटर!"</string>
<string name="operator_settings_title" msgid="6484497120056200416">"ऑपरेटर"</string>
diff --git a/tests/app/res/values-mr/strings.xml b/tests/app/res/values-mr/strings.xml
index 0a53c57..be6511b 100644
--- a/tests/app/res/values-mr/strings.xml
+++ b/tests/app/res/values-mr/strings.xml
@@ -16,13 +16,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="discoverable" msgid="5156521178072363663">"शोधण्यायोग्य"</string>
- <string name="start_scan" msgid="3834980997400324437">"स्कॅन प्रारंभ करा"</string>
+ <string name="discoverable" msgid="5156521178072363663">"शोधसुलभ"</string>
+ <string name="start_scan" msgid="3834980997400324437">"स्कॅन सुरू करा"</string>
<string name="stop_scan" msgid="4195720269023182612">"स्कॅन थांबवा"</string>
<string name="operator_hello" msgid="5164036004953019483">"हॅलो ऑपरेटर!"</string>
<string name="operator_settings_title" msgid="6484497120056200416">"ऑपरेटर"</string>
- <string name="operator_settings_summary" msgid="8356150829172002728">"पसंतीचा क्रियाकलाप प्रारंभ करण्यासाठी वापरले जाऊ शकणारे ऑपरेटर हुक"</string>
+ <string name="operator_settings_summary" msgid="8356150829172002728">"पसंतीची अॅक्टिव्हिटी सुरू करण्यासाठी वापरले जाऊ शकणारे अॉपरेटर हूक"</string>
<string name="manufacturer_hello" msgid="5926168503597475062">"हॅलो निर्माता!"</string>
<string name="manufacturer_settings_title" msgid="3516742885166545864">"निर्माता"</string>
- <string name="manufacturer_settings_summary" msgid="4436962417539186408">"पसंतीचा क्रियाकलाप प्रारंभ करण्यासाठी वापरले जाऊ शकणारे निर्माता हुक"</string>
+ <string name="manufacturer_settings_summary" msgid="4436962417539186408">"पसंतीची अॅक्टिव्हिटी सुरू करण्यासाठी वापरले जाऊ शकणारे निर्माता हूक"</string>
</resources>
diff --git a/tests/app/res/values-pa/strings.xml b/tests/app/res/values-pa/strings.xml
index 61c3102..3604287 100644
--- a/tests/app/res/values-pa/strings.xml
+++ b/tests/app/res/values-pa/strings.xml
@@ -19,9 +19,9 @@
<string name="discoverable" msgid="5156521178072363663">"ਖੋਜਣਯੋਗ"</string>
<string name="start_scan" msgid="3834980997400324437">"ਸਕੈਨ ਚਾਲੂ ਕਰੋ"</string>
<string name="stop_scan" msgid="4195720269023182612">"ਸਕੈਨ ਰੋਕੋ"</string>
- <string name="operator_hello" msgid="5164036004953019483">"ਹੈਲੋ ਕੈਰੀਅਰ!"</string>
- <string name="operator_settings_title" msgid="6484497120056200416">"ਕੈਰੀਅਰ"</string>
- <string name="operator_settings_summary" msgid="8356150829172002728">"ਕੈਰੀਅਰ ਹੁੱਕ ਜਿਸ ਦੀ ਵਰਤੋਂ ਪਸੰਦ ਦੀ ਸਰਗਰਮੀ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"</string>
+ <string name="operator_hello" msgid="5164036004953019483">"ਹੈਲੋ ਓਪਰੇਟਰ!"</string>
+ <string name="operator_settings_title" msgid="6484497120056200416">"ਓਪਰੇਟਰ"</string>
+ <string name="operator_settings_summary" msgid="8356150829172002728">"ਓਪਰੇਟਰ ਹੁੱਕ ਜਿਸਦੀ ਵਰਤੋਂ ਪਸੰਦ ਦੀ ਸਰਗਰਮੀ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"</string>
<string name="manufacturer_hello" msgid="5926168503597475062">"ਹੈਲੋ ਨਿਰਮਾਤਾ!"</string>
<string name="manufacturer_settings_title" msgid="3516742885166545864">"ਨਿਰਮਾਤਾ"</string>
<string name="manufacturer_settings_summary" msgid="4436962417539186408">"ਨਿਰਮਾਤਾ ਹੁੱਕ ਜਿਸ ਦੀ ਵਰਤੋਂ ਪਸੰਦ ਦੀ ਸਰਗਰਮੀ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"</string>
diff --git a/tests/app/res/values-zh-rHK/strings.xml b/tests/app/res/values-zh-rHK/strings.xml
index 335b55c..5517007 100644
--- a/tests/app/res/values-zh-rHK/strings.xml
+++ b/tests/app/res/values-zh-rHK/strings.xml
@@ -17,8 +17,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="discoverable" msgid="5156521178072363663">"可供偵測"</string>
- <string name="start_scan" msgid="3834980997400324437">"開始掃瞄"</string>
- <string name="stop_scan" msgid="4195720269023182612">"停止掃瞄"</string>
+ <string name="start_scan" msgid="3834980997400324437">"開始掃描"</string>
+ <string name="stop_scan" msgid="4195720269023182612">"停止掃描"</string>
<string name="operator_hello" msgid="5164036004953019483">"流動網絡供應商您好！"</string>
<string name="operator_settings_title" msgid="6484497120056200416">"流動網絡供應商"</string>
<string name="operator_settings_summary" msgid="8356150829172002728">"可用來啟動所選活動的流動網絡供應商勾點"</string>
diff --git a/tests/robotests/README.md b/tests/robotests/README.md
new file mode 100644
index 0000000..648f1af
--- /dev/null
+++ b/tests/robotests/README.md
@@ -0,0 +1,24 @@
+# Running Settings Robolectric tests
+
+
+## The full suite
+```
+$ croot
+$ make RunSettingsRoboTests
+```
+
+## Running a single test class
+
+```
+$ croot
+$ make RunSettingsRoboTests ROBOTEST_FILTER=<ClassName>
+```
+
+For example:
+
+```
+make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
+```
+
+You can also use partial class name in ROBOTEST_FILTER. If the partial class name matches
+multiple file names, all of them will be executed.
diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java
new file mode 100644
index 0000000..4c1794c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java
@@ -0,0 +1,123 @@
+package com.android.settings.datetime;
+
+import com.android.settings.datetime.ZonePicker;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.datetime.ZoneGetter;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TimeZone;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ZonePickerComparatorTest {
+
+ // Strings in Chinese are sorted by alphabet order of their Pinyin.
+ // "伦敦" -> "lundun"; "纽约" -> "niuyue"; "悉尼" -> "xini"
+ // "开罗" -> "kailuo"; "雅典" -> "yadian"; "上海" -> "shanghai"
+ private static final String[] TEST_CHINESE_NAME =
+ new String[]{"伦敦", "纽约", "悉尼", "开罗", "雅典", "上海"};
+ private static final String[] ORDERED_CHINESE_NAME =
+ new String[]{"开罗", "伦敦", "纽约", "上海", "悉尼", "雅典"};
+
+ private static final String[] TEST_ENGLISH_NAME =
+ new String[]{"London", "New York", "Sydney", "Cairo", "Athens", "Shanghai"};
+ private static final String[] ORDERED_ENGLISH_NAME =
+ new String[]{"Athens", "Cairo", "London", "New York", "Shanghai", "Sydney"};
+
+ private static final Locale INIT_LOCALE = Locale.getDefault();
+
+ private Map<String, List> mTestDataMap;
+ private List<Map<String, Object>> mTestList;
+
+ @Before
+ public void setUp() {
+ mTestDataMap = new HashMap<>();
+ mTestDataMap.put("zh_CN", Arrays.asList(TEST_CHINESE_NAME));
+ mTestDataMap.put("en_US", Arrays.asList(TEST_ENGLISH_NAME));
+ }
+
+ @After
+ public void tearDown() {
+ Locale.setDefault(INIT_LOCALE);
+ }
+
+ @Test
+ public void testComparator_sortChineseString() {
+ String sortKey = ZoneGetter.KEY_DISPLAY_LABEL;
+ mTestList = getMockZonesList("zh_CN");
+ Locale.setDefault(new Locale("zh"));
+ final ZonePicker.MyComparator comparator = new ZonePicker.MyComparator(sortKey);
+ assertThat(comparator).isNotNull();
+ Collections.sort(mTestList, comparator);
+ for (int i = 0; i < mTestList.size(); i++) {
+ assertThat(mTestList.get(i).get(sortKey).toString())
+ .isEqualTo(ORDERED_CHINESE_NAME[i]);
+ }
+ }
+
+ @Test
+ public void testComparator_sortEnglishString() {
+ String sortKey = ZoneGetter.KEY_DISPLAY_LABEL;
+ mTestList = getMockZonesList("en_US");
+ Locale.setDefault(new Locale("en"));
+ final ZonePicker.MyComparator comparator = new ZonePicker.MyComparator(sortKey);
+ assertThat(comparator).isNotNull();
+ Collections.sort(mTestList, comparator);
+ for (int i = 0; i < mTestList.size(); i++) {
+ assertThat(mTestList.get(i).get(sortKey).toString())
+ .isEqualTo(ORDERED_ENGLISH_NAME[i]);
+ }
+ }
+
+ @Test
+ public void testComparator_sortInteger() {
+ String sortKey = ZoneGetter.KEY_OFFSET;
+ // TestList of any locale can be selected to test integer sorting.
+ mTestList = getMockZonesList("en_US");
+ final ZonePicker.MyComparator comparator = new ZonePicker.MyComparator(sortKey);
+ assertThat(comparator).isNotNull();
+ Collections.sort(mTestList, comparator);
+ for (int i = 0; i < mTestList.size(); i++) {
+ assertThat(mTestList.get(i).get(sortKey)).isEqualTo(i);
+ }
+ }
+
+ private List<Map<String, Object>> getMockZonesList(String locale) {
+ List<Map<String, Object>> zones = new ArrayList<>();
+ List<String> testData = mTestDataMap.get(locale);
+ TimeZone tz = TimeZone.getDefault();
+ int testSize = testData.size();
+ for (int i = 0; i < testSize; i++) {
+ zones.add(createMockDisplayEntry(tz, "GMT+08:00",
+ testData.get(i), testSize - i - 1));
+ }
+ return zones;
+ }
+
+ private Map<String, Object> createMockDisplayEntry(
+ TimeZone tz, CharSequence gmtOffsetText, CharSequence displayName, int offsetMillis) {
+ Map<String, Object> map = new HashMap<>();
+ map.put(ZoneGetter.KEY_ID, tz.getID());
+ map.put(ZoneGetter.KEY_DISPLAYNAME, displayName.toString());
+ map.put(ZoneGetter.KEY_DISPLAY_LABEL, displayName);
+ map.put(ZoneGetter.KEY_GMT, gmtOffsetText.toString());
+ map.put(ZoneGetter.KEY_OFFSET_LABEL, gmtOffsetText);
+ map.put(ZoneGetter.KEY_OFFSET, offsetMillis);
+ return map;
+ }
+}