diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 316f105..d83ac19 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -961,6 +961,7 @@
 
         <activity android:name="Settings$NightDisplaySettingsActivity"
                 android:label="@string/night_display_title"
+                android:enabled="@*android:bool/config_nightDisplayAvailable"
                 android:icon="@drawable/ic_settings_night_display"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 56b5b3d..3b819fc 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-merker is nie skryfbaar nie. Gebruik asseblief \'n ander merker."</string>
     <string name="default_sound" msgid="8821684447333687810">"Verstekgeluid"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Luivolume op <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Luitoestel is op vibreer gestel"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Luitoestel is op stil gestel"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Luivolume op 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Mediavolume"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Wekkervolume"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 02d3e25..60bfa50 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"የNFC መለያ ሊጻፍበት የሚችል አይደለም። እባክዎ የተለየ መለያ ይጠቀሙ።"</string>
     <string name="default_sound" msgid="8821684447333687810">"ነባሪ ድምፅ"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"የጥሪ ድምጽ መጠን <xliff:g id="PERCENTAGE">%1$s</xliff:g> ላይ"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"ደዋዩ ወደ ንዘር ተቀናብሯል"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ደዋዩ ወደ ጸጥታ ተቀናብሯል"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"የጥሪ ድምጽ መጠን 80% ላይ"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"የማህደረመረጃ ክፍልፍል"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"የማንቂያ ድምፅ መጠን"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 25da3db..635e28d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -665,7 +665,7 @@
     <string name="wifi_display_options_done" msgid="5703116500357822557">"تم"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"الاسم"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 غيغاهرتز"</string>
-    <string name="wifi_band_5ghz" msgid="6433822023268515117">"۵ غيغاهرتز"</string>
+    <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 غيغاهرتز"</string>
     <string name="link_speed" msgid="8896664974117585555">"‏%1$d ميغابت في الثانية"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"السماح بتبادل البيانات عندما يلمس الجهاز اللوحي جهازًا آخر"</string>
@@ -2623,6 +2623,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"‏علامة NFC ليست قابلة للكتابة. الرجاء استخدام علامة مختلفة."</string>
     <string name="default_sound" msgid="8821684447333687810">"الصوت الافتراضي"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"مستوى صوت الرنين على <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"تم تعيين الرنين على اهتزاز"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"تم تعيين الرنين على صامت"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"مستوى صوت الرنين على ۸۰٪"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"مستوى صوت الوسائط"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"مستوى صوت المنبّه"</string>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 4f33821..b13d610 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC teqini yazmaq olmur. Başqa teqi sınayın."</string>
     <string name="default_sound" msgid="8821684447333687810">"Defolt səs"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Zəng səsi <xliff:g id="PERCENTAGE">%1$s</xliff:g> faizdir"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Zəng səsi vibrasiya rejimindədir"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Zəng səsi səssiz rejimdədir"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Zəng səsi 80% faizdir"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Media həcmi"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Siqnal səsi həcmi"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 870364a..f00512c 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -2560,6 +2560,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC oznaka ne podržava pisanje. Koristite drugu oznaku."</string>
     <string name="default_sound" msgid="8821684447333687810">"Podrazumevani zvuk"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Jačina zvona je <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Zvono je podešeno na vibraciju"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Zvono je podešeno na nečujno"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Jačina zvona je 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Jačina zvuka medija"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Jačina zvuka alarma"</string>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
index 3e5acc3..90cb097 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be-rBY/strings.xml
@@ -2581,6 +2581,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Запіс на метку NFC немагчымы. Калі ласка, скарыстайцеся іншай меткай."</string>
     <string name="default_sound" msgid="8821684447333687810">"Гук па змаўчанні"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Гучнасць званка – <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Для гуку выкліку заданы рэжым вібрацыі"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Для гуку выкліку заданы бязгучны рэжым"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Гучнасць званка – 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Гучнасць медыя"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Гучнасць будзільніка"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index eb90d86..4e20d97 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Записването в маркера за КБП не е възможно. Моля, използвайте друг."</string>
     <string name="default_sound" msgid="8821684447333687810">"Стандартен звук"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Сила на звука при звънене: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Зададено е вибриране при звънене"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Зададен е тих режим при звънене"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Сила на звука при звънене: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Сила на звука за мултимедия"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Сила на звука на будилника"</string>
@@ -2712,7 +2714,7 @@
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки за известяване"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Отзиви за устройството"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Въведете администраторския ПИН код"</string>
-    <string name="switch_on_text" msgid="1124106706920572386">"Включване"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"Включено"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Изключване"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Фикс. на екрани"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"Когато настройката е включена, можете да фиксирате текущия екран да се показва, докато не го освободите.\n\nЗа да използвате тази функция:\n\n1. Уверете се, че е включена.\n\n2. Отворете екрана, който искате да фиксирате.\n\n3. Докоснете „Общ преглед“.\n\n4. Прекарайте пръст нагоре и докоснете иконата за фиксиране."</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index b5e78ce..f319878 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ট্যাগ লিখনযোগ্য নয়৷ দয়া করে একটি আলাদা ট্যাগ ব্যবহার করুন৷"</string>
     <string name="default_sound" msgid="8821684447333687810">"ডিফল্ট শব্দ"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"রিং ভলিউম <xliff:g id="PERCENTAGE">%1$s</xliff:g> তে রয়েছে"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"রিঙ্গারকে কম্পন অবস্থায় সেট করা হয়েছে"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"রিঙ্গারকে নীরব অবস্থায় সেট করা হয়েছে"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"রিং ভলিউম ৮০% তে রয়েছে"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"মিডিয়া ভলিউম"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"অ্যালার্মের ভলিউম"</string>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index 1ddbb95..73efce6 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -752,7 +752,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite svoju lozinku za mrežu"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Da biste poboljšali preciznost lokacije te u druge svrhe, <xliff:g id="APP_NAME">%1$s</xliff:g> aplikacija želi uključiti skeniranje mreže, čak i kada je Wi-Fi isključen.\n\nŽelite li dozvoliti ovo za sve aplikacije koje žele izvršiti skeniranje?"</string>
-    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Da ovo isključite, idite na Napredno u prelijevajućem izborniku."</string>
+    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Da ovo isključite, idite na Napredno u preklopnom meniju."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dozvoli"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Odbij"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Prijavite se za povezivanje?"</string>
@@ -2560,6 +2560,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag ne podržava zapisivanje. Koristite drugi tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Podrazumijevani zvuk"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Jačina zvona je na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Zvono je postavljeno da vibrira"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Zvono je utišano"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Jačina zvona je na 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Jačina zvuka medijskog sadržaja"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Jačina zvuka alarma"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 36780ac..b4923ab 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"No es pot escriure a l\'etiqueta NFC. Fes servir una altra etiqueta."</string>
     <string name="default_sound" msgid="8821684447333687810">"So predeterminat"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volum del to: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Timbre en vibració"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Timbre en silenci"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volum del to: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volum de multimèdia"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volum de l\'alarma"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index cd3322d..3981785 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2581,6 +2581,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Na štítek NFC nelze zapisovat. Zkuste jiný štítek."</string>
     <string name="default_sound" msgid="8821684447333687810">"Výchozí zvuk"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Hlasitost vyzvánění: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Vyzvánění bylo nastaveno na vibrace"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Vyzvánění bylo ztlumeno"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Hlasitost vyzvánění: 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Hlasitost médií"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hlasitost budíku"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 7256da4..92bbb9a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Der kan ikke skrives til NFC-tagget. Brug et andet tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standardlyd"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Lydstyrken for ringesignalet er på <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringesignalet er indstillet til vibration"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringesignalet er indstillet til lydløs"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Lydstyrken for ringesignalet er på 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Medielydstyrke"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmlydstyrke"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ada435b..092a0fc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"In das NFC-Tag kann nicht geschrieben werden. Bitte verwende ein anderes Tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standardton"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Klingeltonlautstärke: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Klingelton auf Vibrieren gestellt"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Klingelton auf lautlos gestellt"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Klingeltonlautstärke: 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Medienlautstärke"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Weckerlautstärke"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8c959af..b859123 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Δεν υπάρχει δυνατότητα εγγραφής στην ετικέτα ΕΚΠ. Χρησιμοποιήστε μια διαφορετική ετικέτα."</string>
     <string name="default_sound" msgid="8821684447333687810">"Προεπιλεγμένος ήχος"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ένταση ήχου κλήσης στο <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Η ειδοποίηση ήχου ορίστηκε σε δόνηση"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Η ειδοποίηση ήχου τέθηκε σε σίγαση"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ένταση ήχου κλήσης στο 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Ένταση ήχου πολυμέσων"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Ένταση ήχου ξυπνητηριού"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 617b247..616d344 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringer set to vibrate"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringer set to silent"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ring volume at 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Media volume"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm volume"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 617b247..616d344 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringer set to vibrate"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringer set to silent"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ring volume at 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Media volume"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm volume"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 617b247..616d344 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringer set to vibrate"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringer set to silent"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ring volume at 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Media volume"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm volume"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2b8e859..f96a5ab 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"No se puede escribir en la etiqueta NFC. Prueba con una etiqueta diferente."</string>
     <string name="default_sound" msgid="8821684447333687810">"Sonido predeterminado"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volumen de tono: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Timbre en vibración"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Timbre en silencio"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volumen de tono: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volumen multimedia"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volumen de alarma"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index cdba64d..d67e47f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2537,6 +2537,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"No se puede editar la etiqueta NFC. Prueba con otra etiqueta."</string>
     <string name="default_sound" msgid="8821684447333687810">"Sonido predeterminado"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volumen del timbre al <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Timbre en vibración"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Timbre en silencio"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volumen del timbre al 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volumen multimedia"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volumen de la alarma"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 9d11703..90be846 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-kiip ei ole kirjutatav. Kasutage muud kiipi."</string>
     <string name="default_sound" msgid="8821684447333687810">"Vaikeheli"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Helina helitugevus on <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Telefonihelin on seatud vibreerima"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Telefonihelin on seatud hääletuks"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Helina helitugevus on 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Meedia helitugevus"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmi helitugevus"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 4f611e0..850b063 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Ezin da NFC etiketan idatzi. Erabili beste etiketa bat."</string>
     <string name="default_sound" msgid="8821684447333687810">"Soinu lehenetsia"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Tonuaren bolumena: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Dardara moduan ezarri da gailua"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Isilik moduan ezarri da gailua"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Tonuaren bolumena: % 80"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Multimedia-edukiaren bolumena"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmaren bolumena"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0695442..3ad1d2c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -856,7 +856,7 @@
     <string name="home_work_profile_not_supported" msgid="7457951997970419085">"نمایه‌های کاری پشتیبانی نمی‌شوند"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"صدای اعلان پیش‌فرض"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"رسانه"</string>
-    <string name="media_volume_summary" msgid="5363248930648849974">"تنظیم میزان صدا برای موسیقی و ویدیو"</string>
+    <string name="media_volume_summary" msgid="5363248930648849974">"تنظیم میزان صدا برای موسیقی و ویدئو"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"هشدار"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"تنظیمات صوتی برای جایگاه پیوست شده"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"صدای پد شماره‌گیری"</string>
@@ -864,7 +864,7 @@
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"صدای قفل صفحه"</string>
     <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"لرزش هنگام ضربه"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"لغو پارازیت"</string>
-    <string name="volume_media_description" msgid="7949355934788807863">"موسیقی، ویدیو، بازی، و دیگر رسانه‌ها"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"موسیقی، ویدئو، بازی، و دیگر رسانه‌ها"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"آهنگ‌های زنگ و اعلان‌ها"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"اعلان‌ها"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"هشدارها"</string>
@@ -1034,7 +1034,7 @@
     <string name="memory_apps_usage" msgid="5128673488173839077">"برنامه‌ها و داده‌های برنامه"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"رسانه"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"بارگیری‌ها"</string>
-    <string name="memory_dcim_usage" msgid="558887013613822577">"عکس‌ها، ویدیوها"</string>
+    <string name="memory_dcim_usage" msgid="558887013613822577">"عکس‌ها، ویدئوها"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"صوتی (موسیقی، آهنگ‌های زنگ، پادکست‌ها و موارد دیگر)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"سایر فایل‌ها"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"داده‌های موجود در حافظه پنهان"</string>
@@ -1113,7 +1113,7 @@
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"همه برنامه‌ها، عکس‌ها و داده‌های ذخیره شده در این <xliff:g id="NAME">^1</xliff:g> برای همیشه از بین می‌روند."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"برنامه‌ها"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"تصاویر"</string>
-    <string name="storage_detail_videos" msgid="2919743464827110953">"ویدیوها"</string>
+    <string name="storage_detail_videos" msgid="2919743464827110953">"ویدئوها"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"صوتی"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"داده‌های موجود در حافظه پنهان"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"موارد دیگر"</string>
@@ -1846,7 +1846,7 @@
     <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"‏بسته‌های Wi-Fi ارسال شد"</string>
     <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"‏بسته‌های Wi-Fi دریافت شد"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"صوتی"</string>
-    <string name="usage_type_video" msgid="4295357792078579944">"ویدیو"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"ویدئو"</string>
     <string name="usage_type_camera" msgid="8299433109956769757">"دوربین"</string>
     <string name="usage_type_flashlight" msgid="1516392356962208230">"چراغ قوه"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"زمان روشن"</string>
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"‏برچسب NFC قابل نوشتن نیست. لطفاً از یک برچسب متفاوت استفاده کنید."</string>
     <string name="default_sound" msgid="8821684447333687810">"صدای پیش‌فرض"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"بلندی صدای زنگ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"زنگ روی لرزش تنظیم شده است"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"زنگ روی سکوت تنظیم شده است"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"بلندی صدای زنگ ۸۰٪"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"میزان صدای رسانه"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"میزان صدای هشدار"</string>
@@ -3177,7 +3179,7 @@
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"بلوتوث"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"مدیریت حافظه"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"برای کمک به خالی کردن فضای ذخیره‌سازی، مدیر ذخیره‌سازی عکس‌ها و ویدیوهای پشتیبان‌گیری‌شده را از دستگاهتان پاک می‌کند."</string>
-    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"پاک کردن عکس‌ها و ویدیوها"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"پاک کردن عکس‌ها و ویدئوها"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"مدیر فضای ذخیره‌سازی"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"خودکار"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"دستی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5c91651..d1e3a41 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-tagiin ei voi kirjoittaa. Käytä toista tagia."</string>
     <string name="default_sound" msgid="8821684447333687810">"Oletusääni"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Soittoäänen voimakkuus: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Soittoääni on mykistetty. Puhelin värisee, kun saat puhelun."</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Soittoääni on mykistetty."</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Soittoäänen voimakkuus: 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Median äänenvoimakkuus"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hälytyksen voimakkuus"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 59a9e15..ba68cc9 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"La balise NFC n\'est pas accessible en écriture. Veuillez en utiliser un autre."</string>
     <string name="default_sound" msgid="8821684447333687810">"Son par défaut"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Le volume de la sonnerie est à <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Sonnerie en mode vibration"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Sonnerie en mode silencieux"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Le volume de la sonnerie est à 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volume des médias"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume de l\'alarme"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5fbf438..c1ee3fb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Le tag NFC n\'est pas accessible en écriture. Veuillez en utiliser un autre."</string>
     <string name="default_sound" msgid="8821684447333687810">"Son par défaut"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volume de sonnerie à <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Sonnerie en mode vibreur"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Sonnerie en mode silencieux"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volume de sonnerie à 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volume des contenus multimédias"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume de l\'alarme"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index aae35f3..d78d78d 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Non se pode escribir na etiqueta NFC. Utiliza unha etiqueta diferente."</string>
     <string name="default_sound" msgid="8821684447333687810">"Son predeterminado"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volume do timbre ao <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Timbre definido en vibración"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Timbre definido en silencio"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volume do timbre ao 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volume de ficheiros multimedia"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume da alarma"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index ee3fbea..76c5680 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -2541,6 +2541,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ટેગ લખવાયોગ્ય નથી. કૃપા કરીને કોઈ અલગ ટેગનો ઉપયોગ કરો."</string>
     <string name="default_sound" msgid="8821684447333687810">"ડિફોલ્ટ ધ્વનિ"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"રિંગ વૉલ્યુમ <xliff:g id="PERCENTAGE">%1$s</xliff:g> પર છે"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"રિંગર વાઇબ્રેટ પર સેટ કરેલ છે"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"રિંગર શાંત પર સેટ કરેલ છે"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"રિંગ વૉલ્યુમ 80% પર છે"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"મીડિયા વૉલ્યૂમ"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"એલાર્મ વોલ્યુમ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 576bf39..e18507c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC टैग लिखने योग्य नहीं है. कृपया किसी भिन्न टैग का उपयोग करें."</string>
     <string name="default_sound" msgid="8821684447333687810">"डिफ़ॉल्‍ट ध्‍वनि"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"रिंग वॉल्यूम <xliff:g id="PERCENTAGE">%1$s</xliff:g> पर है"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"रिंगर को कंपन पर सेट है"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"रिंगर को मौन पर सेट है"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"रिंग वॉल्यूम 80% पर है"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"मीडिया वॉल्‍यूम"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"अलार्म वॉल्‍यूम"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f29df55..20cfcbb 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -2560,6 +2560,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"U oznaku NFC ne mogu se zapisati podaci. Upotrijebite drugačiju oznaku."</string>
     <string name="default_sound" msgid="8821684447333687810">"Zadani zvuk"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Glasnoća zvona na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Softver zvona postavljen na vibraciju"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Softver zvona postavljen na nečujno"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Glasnoća zvona na 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Glasnoća medija"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Glasnoća alarma"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 54e1323..8ec5ee6 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Az NFC-címke nem írható. Használjon egy másik címkét."</string>
     <string name="default_sound" msgid="8821684447333687810">"Alapértelmezett hang"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Csörgetési hangerő szintje: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Csengetés: rezgő"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Csengetés: néma"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Csörgetés hangereje: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Média hangereje"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Ébresztés hangereje"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index d1e801d..d6960a9 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC պիտակում հնարավոր չէ գրել: Խնդրում ենք օգտագործել այլ պիտակ:"</string>
     <string name="default_sound" msgid="8821684447333687810">"Կանխադրված զանգերանգը"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Զանգի ուժգնությունը <xliff:g id="PERCENTAGE">%1$s</xliff:g>-ի դեպքում"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Զանգի համար ակտիվացված է թրթռումը"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Զանգի ձայնն անջատված է"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Զանգի ուժգնությունը 80%-ի դեպքում"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Մեդիանյութերի ձայնի բարձրությունը"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Զարթուցիչի ձայնի բարձրությունը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 8c8ae39..e162aa4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Tag NFC tidak dapat ditulisi. Gunakan tag lain."</string>
     <string name="default_sound" msgid="8821684447333687810">"Suara default"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volume dering <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Pendering disetel bergetar"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Pendering disetel senyap"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volume dering 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volume media"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume alarm"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 1e0ba21..79ee1e1 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Ekki er hægt að skrifa í NFC-merkið. Notaðu annað merki."</string>
     <string name="default_sound" msgid="8821684447333687810">"Sjálfgefið hljóð"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Hljóðstyrkur er <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Hringjari stilltur á titring"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Hljóð tekið af hringjara"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Hljóðstyrkur er 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Hljóðstyrkur margmiðlunarefnis"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hljóðstyrkur vekjara"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b2edcb0..02e6ecb 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Il tag NFC non è modificabile. Utilizza un tag diverso."</string>
     <string name="default_sound" msgid="8821684447333687810">"Suono predefinito"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volume suoneria: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Suoneria impostata su Vibrazione"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Suoneria impostata su Silenzioso"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volume suoneria all\'80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volume contenuti multimediali"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume sveglia"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6534f82..379c4c8 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -2583,6 +2583,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"‏תג NFC אינו ניתן לכתיבה. השתמש בתג אחר."</string>
     <string name="default_sound" msgid="8821684447333687810">"צליל ברירת מחדל"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"עוצמת צלצול ב-<xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"תוכנת הצלצול במצב רטט"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"תוכנת הצלצול במצב שקט"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"עוצמת צלצול ב-80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"עוצמת קול של מדיה"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"עוצמת קול של התראה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index de2e8be..71ba646 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2543,6 +2543,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFCタグに書き込めません。別のタグを使用してください。"</string>
     <string name="default_sound" msgid="8821684447333687810">"デフォルトの通知音"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"着信音の音量: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"バイブレーション着信に設定"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"マナーモード着信に設定"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"着信音の音量: 80%%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"メディアの音量"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"アラームの音量"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 612914d..9b766f1 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC თეგი ჩაწერადი არ არის. გთხოვთ, გამოიყენოთ სხვა თეგი."</string>
     <string name="default_sound" msgid="8821684447333687810">"ნაგულისხმევი ხმა"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"ზარის სიმძლავრე: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"მრეკავი დაყენებულია ვიბრაციაზე"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"მრეკავი დაყენებულია უხმოზე"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"ზარის სიმძლავრე: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"მედიის ხმა"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"მაღვიძარას ხმა"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index f8aac70..f81deb3 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC белгісіне жазу мүмкін емес. Басқа белгіні пайдаланыңыз."</string>
     <string name="default_sound" msgid="8821684447333687810">"Әдепкі дыбыс"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Қоңыраудың дыбыс деңгейі: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Қоңырау дірілдеу режиміне қойылған"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Қоңырау үнсіз режимге қойылған"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Қоңыраудың дыбыс деңгейі: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Meдианың дыбыс деңгейі"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Дабылдың дыбыс деңгейі"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index bc8ff73..c973b00 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"ស្លាក​អិនអេហ្វ​ស៊ី​មិន​អាច​សរសេរ​បាន។ សូម​ប្រើ​ស្លាក​ផ្សេង។"</string>
     <string name="default_sound" msgid="8821684447333687810">"សំឡេង​លំនាំ​ដើម"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"កម្រិតសំឡេងរោទិ៍ត្រឹម <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"បានកំណត់សំឡេងរោទិ៍ឲ្យញ័រ"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"បានកំណត់សំឡេងរោទិ៍ឲ្យស្ងាត់"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"កម្រិតសំឡេងរោទិ៍ត្រឹម 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"កម្រិត​សំឡេង​មេឌៀ"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"កម្រិត​សំឡេង​រោទ៍"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 07f92c6..c5ce9f6 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ಟ್ಯಾಗ್‌ನಲ್ಲಿ ಬರೆಯಲಾಗುವುದಿಲ್ಲ. ದಯವಿಟ್ಟು ಬೇರೊಂದು ಟ್ಯಾಗ್‌ ಬಳಸಿ."</string>
     <string name="default_sound" msgid="8821684447333687810">"ಡಿಫಾಲ್ಟ್‌‌ ಧ್ವನಿ"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ರಷ್ಟು ರಿಂಗ್ ವಾಲ್ಯೂಮ್"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"ರಿಂಗರ್ ಅನ್ನು ವೈಬ್ರೇಟ್‌‌ಗೆ ಹೊಂದಿಸಲಾಗಿದೆ"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ರಿಂಗರ್ ಅನ್ನು ನಿಶ್ಯಬ್ಧಕ್ಕೆ ಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"80% ರಷ್ಟು ರಿಂಗ್ ವಾಲ್ಯೂಮ್"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"ಮಾಧ್ಯಮ ವಾಲ್ಯೂಮ್"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"ಅಲಾರಮ್ ವಾಲ್ಯೂಮ್"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d0a8ec8..c30e99a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC 태그를 작성할 수 없습니다. 다른 태그를 사용하세요."</string>
     <string name="default_sound" msgid="8821684447333687810">"기본 사운드"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"벨소리 볼륨 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"벨소리 장치가 진동으로 설정됨"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"벨소리 장치가 무음으로 설정됨"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"벨소리 볼륨 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"미디어 볼륨"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"알람 볼륨"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index f5d4913..7c59a3d 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -2538,6 +2538,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC теги жазылбайт. Башка тегди колдонуп көрүңүз."</string>
     <string name="default_sound" msgid="8821684447333687810">"Демейки үн"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Шыңгырдын катуулугу <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Коңгуроо дирилдейт"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Коңгуроонун үнү өчүрүлгөн"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Шыңгырдын катуулугу 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Медианын үнүнүн катуулугу"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Ойготкучтун үнүнүн катуулугу"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index c59c3a9..12d5fea 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"​ແທັກ NFC ແມ່ນ​ບໍ່​ສາ​ມາດ​ຂຽນ​ໄດ້​. ກະ​ລຸ​ນາ​ໃຊ້​ແທັກ​ອັນ​ອື່ນ​."</string>
     <string name="default_sound" msgid="8821684447333687810">"​ສຽງ​ເລີ່ມ​ຕົ້ນ"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"ສຽງໂທລະສັບທີ່ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"ເປີດໃຫ້ສັ່ນເຕືອນແລ້ວ"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ປິດສຽງໂທລະສັບແລ້ວ"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"ສຽງໂທລະສັບທີ່ 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"​ລະ​ດັບ​ສຽງ​ມີ​ເດຍ"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"ລະ​ດັບ​ສຽງ​ໂມງ​ປຸກ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index bc4a1f6..a0379ad 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2581,6 +2581,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Negalima įrašyti į ALR žymą. Naudokite kitą žymą."</string>
     <string name="default_sound" msgid="8821684447333687810">"Numatytasis garsas"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Skambučio garsumas – <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Skambutis nustatytas į vibravimą"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Skambutis nustatytas į tylų"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Skambučio garsumas – 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Medijų garsumas"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Signalo garsumas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3a74a2d..0f17d67 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -2560,6 +2560,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC atzīmē nevar ierakstīt datus. Lūdzu, izmantojiet citu atzīmi."</string>
     <string name="default_sound" msgid="8821684447333687810">"Noklusējuma skaņa"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Zvana skaļums: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Zvanītājam iestatīts vibrācijas režīms."</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Zvanītājam iestatīts klusuma režīms."</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Zvana skaļums: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Multivides skaļums"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Signāla skaļums"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 9e8d76d..ca15f33 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Не може да се пишува на ознаката за NFC. Користете друга ознака."</string>
     <string name="default_sound" msgid="8821684447333687810">"Стандарден звук"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Јачината на звукот на ѕвонењето е на <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ѕвонењето е поставено на вибрации"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ѕвонењето е поставено на безгласен режим"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Јачината на звукот на ѕвонењето е на 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Јачина на звук на медиуми"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Јачина на звук на аларм"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 21d3a45..ec97788 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ടാഗ് റൈറ്റുചെയ്യാനാകുന്നതല്ല. മറ്റൊരു ടാഗ് ഉപയോഗിക്കുക."</string>
     <string name="default_sound" msgid="8821684447333687810">"സ്ഥിര ശബ്‌ദം"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"റിംഗ് വോളിയം: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"വൈബ്രേറ്റുചെയ്യുന്ന തരത്തിൽ റിംഗർ സജ്ജമാക്കി"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"നിശബ്ദമാക്കിയിരിക്കുന്ന തരത്തിൽ റിംഗർ സജ്ജമാക്കി"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"റിംഗ് വോളിയം: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"മീഡിയ വോളിയം"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"അലാറം വോളിയം"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 2ff5695..01fb31f 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC тагь дээр бичих боломжгүй. Өөр тагь ашиглана уу."</string>
     <string name="default_sound" msgid="8821684447333687810">"Үндсэн дуу"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Хонх дуугаргах түвшин <xliff:g id="PERCENTAGE">%1$s</xliff:g>-д"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Хонхыг чичиргээтэй болгож тохируулсан"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Хонхыг чимээгүй болгож тохируулсан"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Хонх дуугаргах түвшин 80%-д"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Медиа дууны хэмжээ"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Сэрүүлгийн дууны хэмжээ"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 5344b36..141f9de 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC टॅग लिहीण्यायोग्य नाही. कृपया भिन्न टॅग वापरा."</string>
     <string name="default_sound" msgid="8821684447333687810">"डीफॉल्ट ध्‍वनी"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"रिंग व्हॉल्यूम <xliff:g id="PERCENTAGE">%1$s</xliff:g> वर"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"रिंगर कंपनवर सेट केले"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"रिंगर शांत वर सेट केले"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"रिंग व्हॉल्यूम 80% वर"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"मीडिया व्हॉल्यूम"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"अलार्म व्हॉल्यूम"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index d61c777..ec55e20 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Teg NFC tidak boleh ditulis. Sila gunakan teg yang berbeza."</string>
     <string name="default_sound" msgid="8821684447333687810">"Bunyi lalai"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Kelantangan deringan pada <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Pendering ditetapkan kepada getar"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Pendering ditetapkan kepada senyap"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Kelantangan deringan pada 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Kelantangan media"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Kelantangan penggera"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index de2e6e1..ec22a10 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC တဲဂ်မှာ ရေးမရနိုင်ပါ။ ကျေးဇူးပြုပြီး အခြား တဲဂ် တစ်ခုကို စမ်းကြည့်ပါ။"</string>
     <string name="default_sound" msgid="8821684447333687810">"ပုံသေ အသံ"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"ဖုန်းမြည်သံ အတိုးအကျယ် <xliff:g id="PERCENTAGE">%1$s</xliff:g> ဖြစ်သည်"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"ဖုန်းမြည်သံကို တုန်ခါမှုအဖြစ် သတ်မှတ်ထားပါသည်"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ဖုန်းမြည်သံကို အသံပိတ်ထားပါသည်"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"ဖုန်းမြည်သံ အတိုးအကျယ် ၈၀% ဖြစ်သည်"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"မီဒီယာ ပမာဏ"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"နှိုးစက် အသံ ပမာဏ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1210b793..bb370df 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-brikken er skrivebeskyttet. Bruk en annen brikke."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standardlyd"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ringevolumet er satt til <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringeprogrammet er satt til vibrering"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringeprogrammet er satt til stille"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ringevolumet er satt til 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Medievolum"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolum"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 78572f2..84844a7 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ट्याग लेख्य छैन। फरक ट्याग प्रयोग गर्नुहोस्।"</string>
     <string name="default_sound" msgid="8821684447333687810">"पूर्वनिर्धारित ध्वनि"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> मा सेट गरिँदा घन्टीको भोल्युम"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"घन्टी बजाउनेलाई कम्पनमा सेट गरिएको छ"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"घन्टी बजाउनेलाई मौनमा सेट गरिएको छ"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"८०% मा सेट गरिँदा घन्टीको भोल्युम"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"मिडिया आवाज मात्रा"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"अलार्म मात्रा"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3f55ebd..e17b752 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-tag is niet beschrijfbaar. Gebruik een andere tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standaardgeluid"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Belvolume op <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Belsoftware ingesteld op trillen"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Belsoftware ingesteld op stil"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Belvolume op 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Mediavolume"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolume"</string>
@@ -2608,7 +2610,7 @@
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"Er zijn geen geïnstalleerde apps die toegang tot meldingen hebben aangevraagd."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Toegang tot meldingen toestaan voor <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan alle meldingen lezen, waaronder persoonlijke gegevens zoals contactnamen en de tekst van berichten die je ontvangt. De app kan ook meldingen afwijzen of actieknoppen in meldingen activeren. \n\nHierdoor kan de app ook \'Niet storen\' in- of uitschakelen en gerelateerde instellingen wijzigen."</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan alle meldingen lezen, waaronder persoonlijke gegevens zoals contactnamen en de tekst van berichten die je ontvangt. De functie kan deze meldingen ook sluiten of actieknoppen die ermee samenhangen activeren. \n\nHierdoor kan de app ook \'Niet storen\' in- of uitschakelen en gerelateerde instellingen wijzigen."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Als je toegang tot meldingen uitschakelt voor <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, kan toegang tot \'Niet storen\' ook worden uitgeschakeld."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Uitschakelen"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Annuleren"</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 2709ba1..b30188e 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ਟੈਗ ਲਿਖਣਯੋਗ ਨਹੀਂ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਵੱਖਰਾ ਟੈਗ ਵਰਤੋ।"</string>
     <string name="default_sound" msgid="8821684447333687810">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਧੁਨੀ"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"ਰਿੰਗ ਵੌਲਯੂਮ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ਹੈ"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"ਰਿੰਗਰ ਥਰਥਰਾਹਟ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ਰਿੰਗਰ ਚੁੱਪ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"ਰਿੰਗ ਵੌਲਯੂਮ 80% ਹੈ"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"ਮੀਡੀਆ ਵੌਲਿਊਮ"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"ਅਲਾਰਮ ਵੌਲਿਊਮ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ceca4a1..01c6106 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2581,6 +2581,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Tag NFC nie pozwala na zapis. Użyj innego tagu."</string>
     <string name="default_sound" msgid="8821684447333687810">"Dźwięk domyślny"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Głośność dzwonka to <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Dzwonek ustawiony na wibrowanie"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Dzwonek wyciszony"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Głośność dzwonka to 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Głośność multimediów"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Głośność alarmu"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 4adf66f..8f71af8 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"A marca NFC não é gravável. Use outra marca."</string>
     <string name="default_sound" msgid="8821684447333687810">"Som padrão"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volume do toque em <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Campainha configurada para vibrar"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Campainha silenciada"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volume do toque em 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volume de mídia"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume do alarme"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2904efb..3034736 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"A etiqueta NFC não é gravável. Utilize uma etiqueta diferente."</string>
     <string name="default_sound" msgid="8821684447333687810">"Som predefinido"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volume do toque a <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Campainha definida como vibração"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Campainha definida como silenciosa"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volume do toque a 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volume de multimédia"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume do alarme"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4adf66f..8f71af8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"A marca NFC não é gravável. Use outra marca."</string>
     <string name="default_sound" msgid="8821684447333687810">"Som padrão"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volume do toque em <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Campainha configurada para vibrar"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Campainha silenciada"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volume do toque em 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volume de mídia"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume do alarme"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index dc98e16..4636cfb 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2560,6 +2560,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Eticheta NFC nu poate fi scrisă. Utilizați altă etichetă."</string>
     <string name="default_sound" msgid="8821684447333687810">"Sunet prestabilit"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volumul soneriei este la <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Soneria este setată pe vibrații"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Soneria este setată pe silențios"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volumul soneriei este la 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volum media"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volum alarmă"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2d42a12..3aa45e1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2581,6 +2581,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Нельзя записать данные на эту NFC-метку. Выберите другую."</string>
     <string name="default_sound" msgid="8821684447333687810">"Мелодия по умолчанию"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Громкость звонка: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Включен вибросигнал"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Включен режим без звука"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Громкость звонка: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Музыка, видео, игры и другие медиафайлы"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Будильник"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 35441a1..fef72fa 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -2541,6 +2541,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ටැගයට ලිවිය නොහැක. කරුණාකර වෙනස් ටැගයක් භාවිත කරන්න."</string>
     <string name="default_sound" msgid="8821684447333687810">"සුපුරුදු හඬ"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> දී නාදක හඬ පරිමාව"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"හඬ නඟනය කම්පනය වන ලෙස සකසා ඇත"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"හඬ නඟනය නිහඬ වන ලෙස සකසා ඇත"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"80% දී නාදක හඬ පරිමාව"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"මාධ්‍ය ශබ්දය"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"සීනුවේ ශබ්දය"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index cf57698..dca9bbd 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2581,6 +2581,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Na štítok NFC sa nedá zapisovať. Skúste iný štítok."</string>
     <string name="default_sound" msgid="8821684447333687810">"Predvolený zvuk"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Hlasitosť zvonenia: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Zvonenie je nastavené na vibrovanie"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Zvonenie je stlmené"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Hlasitosť zvonenia: 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Hlasitosť médií"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hlasitosť budíkov"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1162202..93b8fb4 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2581,6 +2581,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Na oznako NFC ni mogoče zapisovati. Uporabite drugo oznako."</string>
     <string name="default_sound" msgid="8821684447333687810">"Privzeti zvok"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Glasnost zvonjenja: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Zvonjenje je nastavljeno na vibriranje"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Zvonjenje je nastavljeno na tiho"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Glasnost zvonjenja: 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Glasnost predstavnosti"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Glasnost alarma"</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index a5f6f83..22065c9 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Etiketa NFC nuk mund të shkruhet. Përdor një etiketë tjetër."</string>
     <string name="default_sound" msgid="8821684447333687810">"Zëri i parazgjedhur"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volumi i ziles në <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Zilja u caktua me dridhje"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Zilja u vendos në heshtje"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volumi i ziles në 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"volumi i klipit \"media\""</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volumi i alarmit"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 869a811..4584471 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2560,6 +2560,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ознака не подржава писање. Користите другу ознаку."</string>
     <string name="default_sound" msgid="8821684447333687810">"Подразумевани звук"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Јачина звона је <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Звоно је подешено на вибрацију"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Звоно је подешено на нечујно"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Јачина звона је 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Јачина звука медија"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Јачина звука аларма"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 59bcab5..dcd4fe0 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Du kan inte skriva i NFC-etiketten. Använd en annan etikett."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standardsignal"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ringvolym på <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Enheten är inställd på att vibrera som ringsignal"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringsignalen är avstängd"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ringvolym på 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Medievolym"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolym"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d23c027..892c3f9 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2545,6 +2545,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Tagi ya NFC haiandikiki. Tafadhali tumia tagi tofauti."</string>
     <string name="default_sound" msgid="8821684447333687810">"Sauti chaguo-msingi"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Kiwango cha sauti ya mlio ni <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Programu inayotoa milio ya simu imewekwa katika hali ya kutetema"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Programu inayotoa milio ya simu imewekwa katika hali ya kimya"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Kiwango cha sauti ya mlio ni 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Sauti ya media"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Sauti ya kengele"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 0088a13..1df9098 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC குறி எழுதக்கூடியது அல்ல. வேறொரு குறியைப் பயன்படுத்தவும்."</string>
     <string name="default_sound" msgid="8821684447333687810">"இயல்பு ஒலி"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"ரிங் ஒலியளவு: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"ரிங்கர் \"அதிர்வு நிலைக்கு\" அமைக்கப்பட்டது"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ரிங்கர் \"நிசப்த நிலைக்கு\" அமைக்கப்பட்டது"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"ரிங் ஒலியளவு: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"மீடியா ஒலியளவு"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"அலார ஒலியளவு"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 98efd87..6ca1e5d 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ట్యాగ్ వ్రాయదగినది కాదు. దయచేసి వేరే ట్యాగ్‌ను ఉపయోగించండి."</string>
     <string name="default_sound" msgid="8821684447333687810">"డిఫాల్ట్ ధ్వని"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"రింగ్ వాల్యూమ్ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ఉంది"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"రింగర్ వైబ్రేట్‌కి సెట్ చేయబడింది"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"రింగర్ నిశ్శబ్దానికి సెట్ చేయబడింది"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"రింగ్ వాల్యూమ్ 80% ఉంది"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"మీడియా వాల్యూమ్"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"అలారం వాల్యూమ్"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b28ed7d..5097de8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"แท็ก NFC ไม่สามารถเขียนได้ โปรดใช้แท็กอื่น"</string>
     <string name="default_sound" msgid="8821684447333687810">"เสียงเริ่มต้น"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"ระดับเสียงเรียกเข้าที่ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"ตั้งโปรแกรมสร้างเสียงเรียกเข้าเป็นโหมดสั่นแล้ว"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ตั้งโปรแกรมสร้างเสียงเรียกเข้าเป็นโหมดเงียบแล้ว"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"ระดับเสียงเรียกเข้าที่ 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"ระดับเสียงของสื่อ"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"ระดับเสียงปลุก"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 71b33bf..95a87ed 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Hindi nasusulatan ang tag ng NFC. Mangyaring gumamit ng ibang tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default na tunog"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Nasa <xliff:g id="PERCENTAGE">%1$s</xliff:g> ang volume ng pag-ring"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Naka-vibrate ang ringer"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Naka-silent ang ringer"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Nasa 80% ang volume ng pag-ring"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volume ng media"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume ng alarm"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index fbd7237..e29381d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC etiketine yazılamıyor. Lütfen farklı bir etiket kullanın."</string>
     <string name="default_sound" msgid="8821684447333687810">"Varsayılan ses"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Zil sesi seviyesi: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Telefon zili titreşime ayarlandı"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Telefon zili sessize ayarlandı"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Zil sesi seviyesi: %80"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Medya sesi düzeyi"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm sesi düzeyi"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1a13102..2df6972 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -2581,6 +2581,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"У цей NFC-тег не можна записувати дані. Виберіть інший."</string>
     <string name="default_sound" msgid="8821684447333687810">"Звук за умовчанням"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Гучність дзвінка: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Вібрацію під час дзвінка ввімкнено"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Звук дзвінка вимкнено"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Гучність дзвінка: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Гучність медіа"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Гучність будильника"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 8c17994..b62f0c5 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -2529,6 +2529,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"‏NFC ٹیگ لکھنے لائق نہیں ہے۔ براہ کرم ایک مختلف ٹیگ استعمال کریں۔"</string>
     <string name="default_sound" msgid="8821684447333687810">"ڈیفالٹ ساؤنڈ"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"رنگ والیوم <xliff:g id="PERCENTAGE">%1$s</xliff:g> پر ہے"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"رنگر ارتعاش پر سیٹ ہو گیا"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"رنگر خاموش پر سیٹ ہو گیا"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"‏رنگ والیوم ‎80%‎ پر ہے"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"میڈیا والیوم"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"الارم والیوم"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 6891eb2..63d6857 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Ushbu NFC yorliqqa ma’lumot yozib bo‘lmaydi. Boshqa yorliqni tanlang."</string>
     <string name="default_sound" msgid="8821684447333687810">"Birlamchi ovoz"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Qo‘ng‘iroq ovozi balandligi: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Qo‘ng‘iroq vaqti tebranish yoqilgan"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Qo‘ng‘iroq ovozi o‘chirilgan"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Qo‘ng‘iroq ovozi balandligi: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Multimedia ovozi"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Signal ovozi"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1b9597f..8e3d7a7 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Thẻ NFC không thể ghi được. Vui lòng sử dụng một thẻ khác."</string>
     <string name="default_sound" msgid="8821684447333687810">"Âm thanh mặc định"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Âm lượng chuông ở mức <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Đã đặt chuông thành rung"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Đã đặt chuông thành im lặng"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Âm lượng chuông ở mức 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Âm lượng phương tiện"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Âm lượng báo thức"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 556da26..eeb5fbe 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2539,6 +2539,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"无法将数据写入NFC标签，请使用其他标签。"</string>
     <string name="default_sound" msgid="8821684447333687810">"默认铃声"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"铃声音量为 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"振铃器已设为振动"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"振铃器已设为静音"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"铃声音量为 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"媒体音量"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"闹钟音量"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e7c2b2d..80a78eb 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2544,6 +2544,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"無法寫入 NFC 標籤，請使用其他標籤。"</string>
     <string name="default_sound" msgid="8821684447333687810">"預設音效"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"鈴聲音量為 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"響鈴設定為震動"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"響鈴設定為靜音"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"鈴聲音量為 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"媒體音量"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"鬧鐘音量"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3c93823..cc02c5f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2543,6 +2543,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"無法寫入 NFC 標記，請使用其他標記。"</string>
     <string name="default_sound" msgid="8821684447333687810">"預設音效"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"鈴聲音量為 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"鈴聲已設為震動"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"鈴聲已設為靜音"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"鈴聲音量為 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"媒體音量"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"鬧鐘音量"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d5da700..0efd608 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -2540,6 +2540,8 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Umaki we-NFC akabhaleki. Sicela usebenzise umaki owehlukile."</string>
     <string name="default_sound" msgid="8821684447333687810">"Umsindo owufica ukhona"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ivolumu yokukhalisa kokungu-<xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ukukhala kusethelwe ukudlidliza"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ukukhala kusethelwe ukuthula"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ivolumu yokukhalisa kokungu-80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Ivolumu yabezindaba"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Ivolumu ye-alamu"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7cde43b..61f370b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2617,11 +2617,10 @@
 
     <!-- Body of dialog informing user about other files on a storage device [CHAR LIMIT=NONE]-->
     <string name="storage_detail_dialog_other">Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files, and so on.
-\n\nTo see the entire contents of this <xliff:g id="name" example="SD card">^1</xliff:g>, tap Explore.</string>
+\n\nTo see the visible contents of this <xliff:g id="name" example="SD card">^1</xliff:g>, tap Explore.</string>
 
     <!-- Body of dialog informing user about the storage used by the Android System [CHAR LIMIT=NONE]-->
-    <string name="storage_detail_dialog_system">System includes files used internally by the Android operating system.
-\n\nThese files can\u2019t be viewed individually.</string>
+    <string name="storage_detail_dialog_system">System includes files that Android can\u2019t display individually.</string>
 
     <!-- Body of dialog informing user about other users on a storage device [CHAR LIMIT=NONE]-->
     <string name="storage_detail_dialog_user"><xliff:g id="user" example="Guest user">^1</xliff:g> may have saved photos, music, movies, apps, or other data that is taking up <xliff:g id="size" example="1.2 GB">^2</xliff:g> of storage.
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index e37de68..196a4ab 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -203,10 +203,8 @@
     }
 
     private void updateSwitchBarToggleSwitch() {
-        final String settingValue = Settings.Secure.getString(getContentResolver(),
-                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-        final boolean checked = settingValue != null
-                && settingValue.contains(mComponentName.flattenToString());
+        final boolean checked = AccessibilityUtils.getEnabledServicesFromSettings(getActivity())
+                .contains(mComponentName);
         mSwitchBar.setCheckedInternal(checked);
     }
 
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 482703b..796aad7 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -17,6 +17,7 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
+import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
@@ -44,7 +45,7 @@
 import static android.net.TrafficStats.MB_IN_BYTES;
 
 public class BillingCycleSettings extends DataUsageBase implements
-        Preference.OnPreferenceChangeListener {
+        Preference.OnPreferenceChangeListener, DataUsageEditController {
 
     private static final String TAG = "BillingCycleSettings";
     private static final boolean LOGD = false;
@@ -147,33 +148,52 @@
         updatePrefs();
     }
 
+    @Override
+    public NetworkPolicyEditor getNetworkPolicyEditor() {
+        return services.mPolicyEditor;
+    }
+
+    @Override
+    public NetworkTemplate getNetworkTemplate() {
+        return mNetworkTemplate;
+    }
+
+    @Override
+    public void updateDataUsage() {
+        updatePrefs();
+    }
+
     /**
      * Dialog to edit {@link NetworkPolicy#warningBytes}.
      */
     public static class BytesEditorFragment extends DialogFragment
-            implements DialogInterface.OnClickListener{
+            implements DialogInterface.OnClickListener {
         private static final String EXTRA_TEMPLATE = "template";
         private static final String EXTRA_LIMIT = "limit";
         private View mView;
 
-        public static void show(BillingCycleSettings parent, boolean isLimit) {
-            if (!parent.isAdded()) return;
+        public static void show(DataUsageEditController parent, boolean isLimit) {
+            if (!(parent instanceof Fragment)) {
+                return;
+            }
+            Fragment targetFragment = (Fragment) parent;
+            if (!targetFragment.isAdded()) {
+                return;
+            }
 
             final Bundle args = new Bundle();
-            args.putParcelable(EXTRA_TEMPLATE, parent.mNetworkTemplate);
+            args.putParcelable(EXTRA_TEMPLATE, parent.getNetworkTemplate());
             args.putBoolean(EXTRA_LIMIT, isLimit);
 
             final BytesEditorFragment dialog = new BytesEditorFragment();
             dialog.setArguments(args);
-            dialog.setTargetFragment(parent, 0);
-            dialog.show(parent.getFragmentManager(), TAG_WARNING_EDITOR);
+            dialog.setTargetFragment(targetFragment, 0);
+            dialog.show(targetFragment.getFragmentManager(), TAG_WARNING_EDITOR);
         }
 
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Context context = getActivity();
-
-
             final LayoutInflater dialogInflater = LayoutInflater.from(context);
             final boolean isLimit = getArguments().getBoolean(EXTRA_LIMIT);
             mView = dialogInflater.inflate(R.layout.data_usage_bytes_editor, null, false);
@@ -188,8 +208,8 @@
         }
 
         private void setupPicker(EditText bytesPicker, Spinner type) {
-            final BillingCycleSettings target = (BillingCycleSettings) getTargetFragment();
-            final NetworkPolicyEditor editor = target.services.mPolicyEditor;
+            final DataUsageEditController target = (DataUsageEditController) getTargetFragment();
+            final NetworkPolicyEditor editor = target.getNetworkPolicyEditor();
 
             final NetworkTemplate template = getArguments().getParcelable(EXTRA_TEMPLATE);
             final boolean isLimit = getArguments().getBoolean(EXTRA_LIMIT);
@@ -222,8 +242,8 @@
             if (which != DialogInterface.BUTTON_POSITIVE) {
                 return;
             }
-            final BillingCycleSettings target = (BillingCycleSettings) getTargetFragment();
-            final NetworkPolicyEditor editor = target.services.mPolicyEditor;
+            final DataUsageEditController target = (DataUsageEditController) getTargetFragment();
+            final NetworkPolicyEditor editor = target.getNetworkPolicyEditor();
 
             final NetworkTemplate template = getArguments().getParcelable(EXTRA_TEMPLATE);
             final boolean isLimit = getArguments().getBoolean(EXTRA_LIMIT);
@@ -241,7 +261,7 @@
             } else {
                 editor.setPolicyWarningBytes(template, bytes);
             }
-            target.updatePrefs();
+            target.updateDataUsage();
         }
     }
 
@@ -249,7 +269,7 @@
      * Dialog to edit {@link NetworkPolicy#cycleDay}.
      */
     public static class CycleEditorFragment extends DialogFragment implements
-            DialogInterface.OnClickListener{
+            DialogInterface.OnClickListener {
         private static final String EXTRA_TEMPLATE = "template";
         private NumberPicker mCycleDayPicker;
 
@@ -268,8 +288,8 @@
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Context context = getActivity();
-            final BillingCycleSettings target = (BillingCycleSettings) getTargetFragment();
-            final NetworkPolicyEditor editor = target.services.mPolicyEditor;
+            final DataUsageEditController target = (DataUsageEditController) getTargetFragment();
+            final NetworkPolicyEditor editor = target.getNetworkPolicyEditor();
 
             final AlertDialog.Builder builder = new AlertDialog.Builder(context);
             final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
@@ -294,8 +314,8 @@
         @Override
         public void onClick(DialogInterface dialog, int which) {
             final NetworkTemplate template = getArguments().getParcelable(EXTRA_TEMPLATE);
-            final BillingCycleSettings target = (BillingCycleSettings) getTargetFragment();
-            final NetworkPolicyEditor editor = target.services.mPolicyEditor;
+            final DataUsageEditController target = (DataUsageEditController) getTargetFragment();
+            final NetworkPolicyEditor editor = target.getNetworkPolicyEditor();
 
             // clear focus to finish pending text edits
             mCycleDayPicker.clearFocus();
@@ -303,7 +323,7 @@
             final int cycleDay = mCycleDayPicker.getValue();
             final String cycleTimezone = new Time().timezone;
             editor.setPolicyCycleDay(template, cycleDay, cycleTimezone);
-            target.updatePrefs();
+            target.updateDataUsage();
         }
     }
 
@@ -312,7 +332,7 @@
      * {@link NetworkPolicy#limitBytes}.
      */
     public static class ConfirmLimitFragment extends DialogFragment implements
-            DialogInterface.OnClickListener{
+            DialogInterface.OnClickListener {
         private static final String EXTRA_MESSAGE = "message";
         private static final String EXTRA_LIMIT_BYTES = "limitBytes";
         public static final float FLOAT = 1.2f;
diff --git a/src/com/android/settings/datausage/DataUsageEditController.java b/src/com/android/settings/datausage/DataUsageEditController.java
new file mode 100644
index 0000000..adc0fe7
--- /dev/null
+++ b/src/com/android/settings/datausage/DataUsageEditController.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2016 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.datausage;
+
+import android.net.NetworkTemplate;
+import com.android.settingslib.NetworkPolicyEditor;
+
+/**
+ * Used to create a dialog that modifies the Cellular data warning amount.
+ */
+public interface DataUsageEditController {
+    /**
+     * @return NetworkPolicyEditor to update the values of the data warning and usage limits.
+     */
+    NetworkPolicyEditor getNetworkPolicyEditor();
+
+    /**
+     * @return NetworkTemplate to get the currently set values of the data warning and usage limits.
+     */
+    NetworkTemplate getNetworkTemplate();
+
+    /**
+     * Callback to update the UI and values changed by the Dialog.
+     */
+    void updateDataUsage();
+}
diff --git a/src/com/android/settings/datausage/DataUsageInfoController.java b/src/com/android/settings/datausage/DataUsageInfoController.java
new file mode 100644
index 0000000..115e45e
--- /dev/null
+++ b/src/com/android/settings/datausage/DataUsageInfoController.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2016 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.datausage;
+
+import android.net.NetworkPolicy;
+import com.android.settingslib.net.DataUsageController.DataUsageInfo;
+
+/**
+ * Controller to handle caching and mobile data logic.
+ */
+public class DataUsageInfoController {
+    /**
+     * Take the cached data usage values in the NetworkPolicy to update DataUsageInfo.
+     */
+    public void updateDataLimit(DataUsageInfo info, NetworkPolicy policy) {
+        if (info == null || policy == null) {
+            return;
+        }
+        if (policy.warningBytes >= 0) {
+            info.warningLevel = policy.warningBytes;
+        }
+        if (policy.limitBytes >= 0) {
+            info.limitLevel = policy.limitBytes;
+        }
+    }
+
+    /**
+     * @returns the most appropriate limit for the data usage summary. Use the total usage when it
+     * is higher than the limit and warning level. Use the limit when it is set and less than usage.
+     * Otherwise use warning level.
+     */
+    public long getSummaryLimit(DataUsageInfo info) {
+        long limit = info.limitLevel;
+        if (limit <= 0) {
+            limit = info.warningLevel;
+        }
+        if (info.usageLevel > limit) {
+            limit = info.usageLevel;
+        }
+        return limit;
+    }
+}
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index a1d19c0..f975d11 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -48,6 +48,7 @@
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.NetworkPolicyEditor;
 import com.android.settingslib.net.DataUsageController;
 
 import java.util.ArrayList;
@@ -56,7 +57,7 @@
 import static android.net.ConnectivityManager.TYPE_ETHERNET;
 import static android.net.ConnectivityManager.TYPE_WIFI;
 
-public class DataUsageSummary extends DataUsageBase implements Indexable {
+public class DataUsageSummary extends DataUsageBase implements Indexable, DataUsageEditController {
 
     private static final String TAG = "DataUsageSummary";
     static final boolean LOGD = false;
@@ -69,6 +70,7 @@
     private static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
 
     private DataUsageController mDataUsageController;
+    private DataUsageInfoController mDataInfoController;
     private SummaryPreference mSummaryPreference;
     private Preference mLimitPreference;
     private NetworkTemplate mDefaultTemplate;
@@ -80,6 +82,7 @@
 
         boolean hasMobileData = hasMobileData(getContext());
         mDataUsageController = new DataUsageController(getContext());
+        mDataInfoController = new DataUsageInfoController();
         addPreferencesFromResource(R.xml.data_usage);
 
         int defaultSubId = getDefaultSubscriptionId(getContext());
@@ -87,15 +90,13 @@
             hasMobileData = false;
         }
         mDefaultTemplate = getDefaultTemplate(getContext(), defaultSubId);
-        if (hasMobileData) {
-            mLimitPreference = findPreference(KEY_LIMIT_SUMMARY);
-        } else {
-            removePreference(KEY_LIMIT_SUMMARY);
-        }
+        mSummaryPreference = (SummaryPreference) findPreference(KEY_STATUS_HEADER);
+
         if (!hasMobileData || !isAdmin()) {
             removePreference(KEY_RESTRICT_BACKGROUND);
         }
         if (hasMobileData) {
+            mLimitPreference = findPreference(KEY_LIMIT_SUMMARY);
             List<SubscriptionInfo> subscriptions =
                     services.mSubscriptionManager.getActiveSubscriptionInfoList();
             if (subscriptions == null || subscriptions.size() == 0) {
@@ -104,6 +105,10 @@
             for (int i = 0; subscriptions != null && i < subscriptions.size(); i++) {
                 addMobileSection(subscriptions.get(i).getSubscriptionId());
             }
+            mSummaryPreference.setSelectable(true);
+        } else {
+            removePreference(KEY_LIMIT_SUMMARY);
+            mSummaryPreference.setSelectable(false);
         }
         boolean hasWifiRadio = hasWifiRadio(getContext());
         if (hasWifiRadio) {
@@ -116,7 +121,6 @@
                 : hasWifiRadio ? R.string.wifi_data_template
                 : R.string.ethernet_data_template;
 
-        mSummaryPreference = (SummaryPreference) findPreference(KEY_STATUS_HEADER);
         setHasOptionsMenu(true);
     }
 
@@ -142,6 +146,15 @@
         return false;
     }
 
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        if (preference == findPreference(KEY_STATUS_HEADER)) {
+            BillingCycleSettings.BytesEditorFragment.show(this, false);
+            return false;
+        }
+        return super.onPreferenceTreeClick(preference);
+    }
+
     private void addMobileSection(int subId) {
         TemplatePreferenceCategory category = (TemplatePreferenceCategory)
                 inflatePreferences(R.xml.data_usage_cellular);
@@ -224,16 +237,14 @@
         DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo(
                 mDefaultTemplate);
         Context context = getContext();
+
+        mDataInfoController.updateDataLimit(info,
+                services.mPolicyEditor.getPolicy(mDefaultTemplate));
+
         if (mSummaryPreference != null) {
             mSummaryPreference.setTitle(
                     formatTitle(context, getString(mDataUsageTemplate), info.usageLevel));
-            long limit = info.limitLevel;
-            if (limit <= 0) {
-                limit = info.warningLevel;
-            }
-            if (info.usageLevel > limit) {
-                limit = info.usageLevel;
-            }
+            long limit = mDataInfoController.getSummaryLimit(info);
             mSummaryPreference.setSummary(info.period);
             mSummaryPreference.setLabels(Formatter.formatFileSize(context, 0),
                     Formatter.formatFileSize(context, limit));
@@ -258,6 +269,21 @@
         return MetricsEvent.DATA_USAGE_SUMMARY;
     }
 
+    @Override
+    public NetworkPolicyEditor getNetworkPolicyEditor() {
+        return services.mPolicyEditor;
+    }
+
+    @Override
+    public NetworkTemplate getNetworkTemplate() {
+        return mDefaultTemplate;
+    }
+
+    @Override
+    public void updateDataUsage() {
+        updateState();
+    }
+
     /**
      * Test if device has an ethernet network connection.
      */
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 94b1937..efb1e0f 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -72,8 +72,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import static com.android.settings.deviceinfo.StorageSettings.TAG;
-
 /**
  * Panel showing summary and actions for a {@link VolumeInfo#TYPE_PRIVATE}
  * storage volume.
@@ -82,6 +80,9 @@
     // TODO: disable unmount when providing over MTP/PTP
     // TODO: warn when mounted read-only
 
+    private static final String TAG = "PrivateVolumeSettings";
+    private static final boolean LOGV = false;
+
     private static final String TAG_RENAME = "rename";
     private static final String TAG_OTHER_INFO = "otherInfo";
     private static final String TAG_SYSTEM_INFO = "systemInfo";
@@ -164,6 +165,9 @@
         final long sharedDataSize = mVolume.getPath().getTotalSpace();
         mTotalSize = getArguments().getLong(EXTRA_VOLUME_SIZE, 0);
         mSystemSize = mTotalSize - sharedDataSize;
+        if (LOGV) Log.v(TAG,
+                "onCreate() mTotalSize: " + mTotalSize + " sharedDataSize: " + sharedDataSize);
+
         if (mTotalSize <= 0) {
             mTotalSize = sharedDataSize;
             mSystemSize = 0;
@@ -260,6 +264,8 @@
         final long freeBytes = mVolume.getPath().getFreeSpace();
         final long usedBytes = mTotalSize - freeBytes;
 
+        if (LOGV) Log.v(TAG, "update() freeBytes: " + freeBytes + " usedBytes: " + usedBytes);
+
         final BytesResult result = Formatter.formatBytes(getResources(), usedBytes, 0);
         mSummary.setTitle(TextUtils.expandTemplate(getText(R.string.storage_size_large),
                 result.value, result.units));
@@ -554,6 +560,11 @@
     };
 
     private void updateDetails(MeasurementDetails details) {
+        StorageItemPreference otherItem = null;
+        long accountedSize = 0;
+        long totalMiscSize = 0;
+        long totalDownloadsSize = 0;
+
         for (int i = 0; i < mItemPoolIndex; ++i) {
             StorageItemPreference item = mItemPreferencePool.get(i);
             final int userId = item.userHandle;
@@ -566,20 +577,31 @@
             switch (itemTitleId) {
                 case R.string.storage_detail_system: {
                     updatePreference(item, mSystemSize);
+                    accountedSize += mSystemSize;
+                    if (LOGV) Log.v(TAG, "mSystemSize: " + mSystemSize
+                            + " accountedSize: " + accountedSize);
                 } break;
                 case R.string.storage_detail_apps: {
                     updatePreference(item, details.appsSize.get(userId));
+                    accountedSize += details.appsSize.get(userId);
+                    if (LOGV) Log.v(TAG, "appsSize: " + details.appsSize.get(userId)
+                            + " accountedSize: " + accountedSize);
                 } break;
                 case R.string.storage_detail_images: {
                     final long imagesSize = totalValues(details, userId,
-                            Environment.DIRECTORY_DCIM, Environment.DIRECTORY_MOVIES,
-                            Environment.DIRECTORY_PICTURES);
+                            Environment.DIRECTORY_DCIM, Environment.DIRECTORY_PICTURES);
                     updatePreference(item, imagesSize);
+                    accountedSize += imagesSize;
+                    if (LOGV) Log.v(TAG, "imagesSize: " + imagesSize
+                            + " accountedSize: " + accountedSize);
                 } break;
                 case R.string.storage_detail_videos: {
                     final long videosSize = totalValues(details, userId,
                             Environment.DIRECTORY_MOVIES);
                     updatePreference(item, videosSize);
+                    accountedSize += videosSize;
+                    if (LOGV) Log.v(TAG, "videosSize: " + videosSize
+                            + " accountedSize: " + accountedSize);
                 } break;
                 case R.string.storage_detail_audio: {
                     final long audioSize = totalValues(details, userId,
@@ -587,19 +609,54 @@
                             Environment.DIRECTORY_ALARMS, Environment.DIRECTORY_NOTIFICATIONS,
                             Environment.DIRECTORY_RINGTONES, Environment.DIRECTORY_PODCASTS);
                     updatePreference(item, audioSize);
+                    accountedSize += audioSize;
+                    if (LOGV) Log.v(TAG, "audioSize: " + audioSize
+                            + " accountedSize: " + accountedSize);
                 } break;
                 case R.string.storage_detail_other: {
-                    updatePreference(item, details.miscSize.get(userId));
+                    final long downloadsSize = totalValues(details, userId,
+                            Environment.DIRECTORY_DOWNLOADS);
+                    final long miscSize = details.miscSize.get(userId);
+                    totalDownloadsSize += downloadsSize;
+                    totalMiscSize += miscSize;
+                    accountedSize += miscSize + downloadsSize;
+
+                    if (LOGV)
+                        Log.v(TAG, "miscSize for " + userId + ": " + miscSize + "(total: "
+                                + totalMiscSize + ") \ndownloadsSize: " + downloadsSize + "(total: "
+                                + totalDownloadsSize + ") accountedSize: " + accountedSize);
+
+                    // Cannot display 'Other' until all known items are accounted for.
+                    otherItem = item;
                 } break;
                 case R.string.storage_detail_cached: {
                     updatePreference(item, details.cacheSize);
+                    accountedSize += details.cacheSize;
+                    if (LOGV)
+                        Log.v(TAG, "cacheSize: " + details.cacheSize + " accountedSize: "
+                                + accountedSize);
                 } break;
                 case 0: {
                     final long userSize = details.usersSize.get(userId);
                     updatePreference(item, userSize);
+                    accountedSize += userSize;
+                    if (LOGV) Log.v(TAG, "userSize: " + userSize
+                            + " accountedSize: " + accountedSize);
                 } break;
             }
         }
+        if (otherItem != null) {
+            final long usedSize = mTotalSize - details.availSize;
+            final long unaccountedSize = usedSize - accountedSize;
+            final long otherSize = totalMiscSize + totalDownloadsSize + unaccountedSize;
+            if (LOGV)
+                Log.v(TAG, "Other items: \n\tmTotalSize: " + mTotalSize + " availSize: "
+                        + details.availSize + " usedSize: " + usedSize + "\n\taccountedSize: "
+                        + accountedSize + " unaccountedSize size: " + unaccountedSize
+                        + "\n\ttotalMiscSize: " + totalMiscSize + " totalDownloadsSize: "
+                        + totalDownloadsSize + "\n\tdetails: " + details);
+            updatePreference(otherItem, otherSize);
+        }
     }
 
     private void updatePreference(StorageItemPreference pref, long size) {