diff --git a/TEST_MAPPING b/TEST_MAPPING
index 3e32512..4865e19 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -9,12 +9,7 @@
       ]
     },
     {
-      "name": "SettingsPrefTests",
-      "options": [
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        }
-      ]
+      "name": "SettingsPerfTests"
     }
   ]
 }
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index e64c50a..25481f2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Wys op aftrekskerm en op sluitskerm"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Wys op aftrekskerm en statusbalk"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Wys op aftrekskerm, statusbalk en sluitskerm"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Flikkerende lig"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Sluitskerm"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Slaan sluitskerm oor"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index cc485ef..f667ee0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"በታች ተጎታች ጥላ ውስጥ እና በማያ ገጽ ቁልፍ ላይ አሳይ"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"በታች ተጎታች ጥላ ውስጥ እና በሁኔታ አሞሌ ላይ አሳይ"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"በታች ተጎታች ጥላ ውስጥ፣ በሁኔታ አሞሌ እና በማያ ገጽ ቁልፍ ላይ አሳይ"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"ብርሃን አብለጭለጭ"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"ማያ ገጽ ቁልፍ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"የማያ ገጽ ቁልፍን ይዝለሉ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 528a24b..d924ef5 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -3166,7 +3166,7 @@
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"سيتم حذف كل التطبيقات والبيانات في هذه الجلسة."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"إزالة"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"تفعيل المكالمات الهاتفية"</string>
-    <string name="user_enable_calling_sms" msgid="8546430559552381324">"‏تشغيل المكالمات الهاتفية والرسائل القصيرة SMS"</string>
+    <string name="user_enable_calling_sms" msgid="8546430559552381324">"تفعيل المكالمات الهاتفية والرسائل القصيرة"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"حذف حساب المستخدم"</string>
     <string name="user_enable_calling_confirm_title" msgid="7868894792723368364">"هل تريد تفعيل المكالمات الهاتفية؟"</string>
     <string name="user_enable_calling_confirm_message" msgid="4924965198409050155">"ستتم مشاركة سجل المكالمات مع هذا المستخدم."</string>
@@ -3620,6 +3620,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"يظهر في خيار منسدِل وعلى شاشة التأمين."</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"يظهر في خيار منسدل وفي شريط الحالة"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"يظهر في خيار منسدل وفي شريط الحالة وفي شاشة التأمين"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"وميض الضوء"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"شاشة القفل"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"تخطي شاشة التأمين"</string>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index ede4234..c1a8a78 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -405,9 +405,17 @@
     <item msgid="2836895041823327816">"নীলাৰ ওপৰত হালধীয়া"</item>
     <item msgid="747238414788976867">"নিজৰ উপযোগিতা অনুযায়ী তৈয়াৰ কৰা"</item>
   </string-array>
-    <!-- no translation found for vpn_types_long:6 (4631647675167100375) -->
-    <!-- no translation found for vpn_types_long:7 (8812228622975052811) -->
-    <!-- no translation found for vpn_types_long:8 (6630554779981113046) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6621806338070912611">"পিপিটিপি ভিপিএন"</item>
+    <item msgid="2552427673212085780">"পূৰ্বে ভাগ-বতৰা কৰা কীসমূহৰ সৈতে L2TP/IPSec ভিপিএন"</item>
+    <item msgid="7378096704485168082">"প্ৰমাণপত্ৰসহ L2TP/IPSec ভিপিএন"</item>
+    <item msgid="3792393562235791509">"পূৰ্বতে শ্বেয়াৰ কৰা কী আৰু Xauth সত্যাপনসহ IPSec ভিপিএন"</item>
+    <item msgid="2484564813864139237">"প্ৰমাণপত্ৰ আৰু Xauth বিশ্ৱাসযোগ্যতা প্ৰামাণিকৰণৰ সৈতে IPSec ভিপিএন"</item>
+    <item msgid="68918911194507915">"প্ৰমাণপত্ৰ আৰু হাইব্ৰিড সত্যাপনসহ IPSec ভিপিএন"</item>
+    <item msgid="4631647675167100375">"প্ৰমাণপত্ৰ আৰু ব্যৱহাৰকাৰীৰ নাম/পাছৱৰ্ডৰ বিশ্বাসযোগ্যতা প্ৰমাণীকৰণৰ সৈতে IKEv2/IPSec VPN"</item>
+    <item msgid="8812228622975052811">"পূৰ্বতে শ্বেয়াৰ কৰা চাবিৰ সৈতে IKEv2/IPSec VPN"</item>
+    <item msgid="6630554779981113046">"প্ৰমাণপত্ৰৰ সৈতে IKEv2/IPSec VPN"</item>
+  </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="7165538292837266997">"এটাও নাই"</item>
     <item msgid="2397017538263427575">"মেনুৱেল"</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index f2417bb..9e0dd89 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"পুল-ডাউন শ্বেড আৰু লক স্ক্ৰীণত দেখুৱাওক"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"পুল-ডাউন শ্বেড আৰু ষ্টেটাছ বাৰত দেখুৱাওক"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"পুল-ডাউন শ্বেড, ষ্টেটাছ বাৰ আৰু লক স্ক্ৰীণত দেখুৱাওক"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"অনুজ্জ্বল পোহৰ"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"লক স্ক্ৰীণ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"লক স্ক্ৰীণ বাদ দিয়ক"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 82dbb22..98d873b 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Aşağı açılan menyu &amp; kilid ekranında görünür"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Aşağı açılan menyu &amp; status panelidə görünür"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Aşağı açılan menyu, status paneli &amp; kilid ekranında görünür"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Parıltı işığı"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Ekran kilidi"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Kilid ekranını keçin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 66ebee6..b2ab5b0 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -3482,6 +3482,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Prikaži na kliznom panelu i zaključanom ekranu"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Prikaži na kliznom panelu i statusnoj traci"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Prikaži na kliznom panelu, statusnoj traci i zaključanom ekranu"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Uključi treperenje lampice"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Zaključan ekran"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskakanje zaključanog ekrana"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index d77dfcd..d35d906 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -3528,6 +3528,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Паказваць на апушчанай шторцы і на экране блакіроўкі"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Паказваць на апушчанай шторцы і на панэлі стану"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Паказваць на апушчанай шторцы, панэлі стану і на экране блакіроўкі"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Мігценне святла"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Экран блакіроўкі"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Прапускаць экран блакіроўкі"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0480abdc..970e28b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Показване в падащия панел и на заключения екран"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Показване в падащия панел и в лентата на състоянието"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Показване в падащия панел, в лентата на състоянието и на заключения екран"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Премигваща светлина"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Заключен екран"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Пропускане на заключения екран"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index a9b177e..46f257f 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"পুল-ডাউন শেড ও লক স্ক্রিনে দেখানো হয়"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"পুল-ডাউন শেড ও স্ট্যাটাস বারে দেখানো হয়"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"পুল-ডাউন শেড, স্ট্যাটাস বার ও লক স্ক্রিনে দেখানো হয়"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"মিটমিট করা আলো"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"লক স্ক্রিন"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"লক স্ক্রিন এড়িয়ে যান"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 7276380..59df8be 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -3482,6 +3482,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Prikaži na padajućoj traci i zaključanom ekranu"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Prikaži na padajućoj traci i statusnoj traci"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Prikaži na padajućoj traci, statusnoj traci i zaključanom ekranu"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Trepćuće svjetlo"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Zaključani ekran"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskoči zaključavanje ekrana"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 31dc6be..353743a 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -414,7 +414,7 @@
     <item msgid="68918911194507915">"VPN IPSec amb certificats i autenticació híbrida"</item>
     <item msgid="4631647675167100375">"VPN IKEv2/IPSec amb certificats i autenticació mitjançant nom d\'usuari i contrasenya"</item>
     <item msgid="8812228622975052811">"VPN IKEv2/IPSec amb claus precompartides"</item>
-    <item msgid="6630554779981113046">"VPN IKEv2/IPSec VPN amb certificats"</item>
+    <item msgid="6630554779981113046">"VPN IKEv2/IPSec amb certificats"</item>
   </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="7165538292837266997">"Cap"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index dd66250..3bc9326 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Es mostra a l\'àrea de notificacions i a la pantalla de bloqueig"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Es mostra a l\'àrea desplegable i la barra d\'estat"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Es mostra a l\'àrea desplegable, la barra d\'estat i la pantalla de bloqueig"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Llum intermitent"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Pantalla de bloqueig"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Omet la pantalla de bloqueig"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 10a07ec..732b088 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -3528,6 +3528,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Zobrazí se na vysouvacím panelu a obrazovce uzamčení"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Zobrazí se na vysouvacím panelu a stavovém řádku"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Zobrazí se na vysouvacím panelu, stavovém řádku a obrazovce uzamčení"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blikání kontrolky"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Obrazovka uzamčení"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Přeskočit obrazovku uzamčení"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index cbf3067..9d94012 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Vises i panelet, der trækkes ned, og på låseskærmen"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Vises i panelet, der trækkes ned, og på statusbjælken."</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Vises i panelet, der trækkes ned, på statusbjælken og på låseskærmen."</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blinkende lys"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Låseskærm"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Spring låseskærmen over"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9d2c973..de233e8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -3437,6 +3437,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Benachrichtigungen erscheinen in Benachrichtigungsleiste und auf Sperrbildschirm"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Benachrichtigungen erscheinen in Benachrichtigungs- und Statusleiste"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Benachrichtigungen erscheinen in Benachrichtigungs-/Statusleiste und auf Sperrbildschirm"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Benachrichtigungslicht blinkt"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Sperrbildschirm"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Sperrbildschirm überspringen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7132bce..9947765 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Εμφανίζονται στο αναπτυσσόμενο πλαίσιο σκίασης και την οθόνη κλειδώματος"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Εμφανίζονται στο αναπτυσσόμενο πλαίσιο σκίασης και τη γραμμή κατάστασης"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Εμφανίζονται στο αναπτυσσόμενο πλαίσιο σκίασης, τη γραμμή κατάστασης και την οθόνη κλειδώματος"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Φως που αναβοσβήνει"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Οθόνη κλειδώματος"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Παράβλεψη οθόνης κλειδώματος"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index c34ec1c..fd0e120 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -3436,6 +3436,7 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Display in pull-down shade &amp; on lock screen"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Display in pull-down shade &amp; status bar"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Display in pull-down shade, status bar &amp; on lock screen"</string>
+    <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Hide silent notifications in status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blink light"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Lock screen"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Skip lock screen"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index b5fadd1..d07abcb 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -3436,6 +3436,7 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Display in pull-down shade &amp; on lock screen"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Display in pull-down shade &amp; status bar"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Display in pull-down shade, status bar &amp; on lock screen"</string>
+    <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Hide silent notifications in status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blink light"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Lock screen"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Skip lock screen"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c34ec1c..fd0e120 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -3436,6 +3436,7 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Display in pull-down shade &amp; on lock screen"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Display in pull-down shade &amp; status bar"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Display in pull-down shade, status bar &amp; on lock screen"</string>
+    <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Hide silent notifications in status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blink light"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Lock screen"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Skip lock screen"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index badae75..e10ea44 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -3436,6 +3436,7 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Display in pull-down shade &amp; on lock screen"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Display in pull-down shade &amp; status bar"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Display in pull-down shade, status bar &amp; on lock screen"</string>
+    <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Hide silent notifications in status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blink light"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Lock screen"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Skip lock screen"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 9901c4d..426ec16 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -3436,6 +3436,7 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎Display in pull-down shade &amp; on lock screen‎‏‎‎‏‎"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎Display in pull-down shade &amp; status bar‎‏‎‎‏‎"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎Display in pull-down shade, status bar &amp; on lock screen‎‏‎‎‏‎"</string>
+    <string name="silent_notifications_status_bar" msgid="6113307620588767516">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‎‎Hide silent notifications in status bar‎‏‎‎‏‎"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎Blink light‎‏‎‎‏‎"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎Lock screen‎‏‎‎‏‎"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎Skip lock screen‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e2b2015..f2abcb5 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Mostrar en banner desplegable y pantalla bloqueada"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Mostrar en banner desplegable y barra de estado"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Mostrar en banner desplegable, barra de estado y pantalla bloqueada"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Luz intermitente"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Pantalla de bloqueo"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Omitir pantalla bloqueada"</string>
@@ -4304,7 +4306,7 @@
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="2956636269742745449">"Consulta tus notificaciones rápidamente"</string>
     <string name="gesture_setting_on" msgid="3223448394997988591">"Activado"</string>
     <string name="gesture_setting_off" msgid="3444029475726294919">"Desactivado"</string>
-    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="65713754674288193">"El cargador de inicio está desbloqueado"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="65713754674288193">"El bootloader está desbloqueado"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="8045017109714463041">"Primero debes conectarte a Internet"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="7425519481227423860">"Conéctate a Internet o comunícate con tu proveedor"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="168124660162907358">"No disponible en dispositivos bloqueados por el proveedor"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6360fd9..564a885 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Se muestra en la pantalla desplegable y en la pantalla de bloqueo"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Se muestra en la pantalla desplegable y en la barra de estado"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Se muestra en el desplegable, la barra de estado y la pantalla de bloqueo"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Luz parpadeante"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Pantalla de bloqueo"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Saltar pantalla de bloqueo"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 6c73385..34c00f2 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Kuva allatõmmatavas menüüs ja lukustuskuval"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Kuva allatõmmatavas menüüs ja olekuribal"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Kuva allatõmmatavas menüüs, olekuribal ja lukustuskuval"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Vilkuv tuli"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Lukustuskuva"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Lukustuskuva vahelejätmine"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index ee577bb..b202143 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Bistaratu goitibeherako barran eta pantaila blokeatuan"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Bistaratu goitibeherako barran eta egoera-barran"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Bistaratu goitibeherako barran, egoera-barran eta pantaila blokeatuan"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Argi keinukaria"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Pantaila blokeatua"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Saltatu pantaila blokeatua"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 70fe21d..52b1af3 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -412,7 +412,7 @@
     <item msgid="3792393562235791509">"‏IPSec VPN با کلیدهای از قبل به اشتراک گذاشته شده و احراز هویت Xauth"</item>
     <item msgid="2484564813864139237">"‏IPSec VPN با گواهی و احراز هویت Xauth"</item>
     <item msgid="68918911194507915">"‏IPSec VPN دارای گواهی و احراز هویت دوگانه"</item>
-    <item msgid="4631647675167100375">"‏IKEv2/IPSec VPN دارای گواهی و احراز هویت نام کاربری/گذرواژه"</item>
+    <item msgid="4631647675167100375">"‏IKEv2/IPSec VPN دارای گواهی و احراز هویت گذرواژه/ نام کاربری"</item>
     <item msgid="8812228622975052811">"‏IKEv2/IPSec VPN با کلیدهای ازپیش مشترک‌شده"</item>
     <item msgid="6630554779981113046">"‏IKEv2/IPSec VPN دارای گواهی"</item>
   </string-array>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e5f8128..47b9771 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"در کشوی اعلان‌های پایین‌کش و در صفحه قفل نشان داده می‌شود"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"در کشوی اعلان‌های پایین‌کش و نوار وضعیت نشان داده می‌شود"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"در کشوی اعلان‌های پایین‌کش، نوار وضعیت و صفحه قفل نشان داده می‌شود"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"نور چشمک‌زن"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"صفحه قفل"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"رد کردن صفحه قفل"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 30f48aa..7eb9414 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2596,7 +2596,7 @@
     <string name="tts_reset" msgid="9047681050813970031">"Nollaa"</string>
     <string name="tts_play" msgid="2945513377250757221">"Toista"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
-    <string name="credentials_title" msgid="7535942196886123656">"Käyttöoikeustietojen tallennus"</string>
+    <string name="credentials_title" msgid="7535942196886123656">"Kirjautumistietojen tallennustila"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Varmenteen asentaminen"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Asenna varmenteet tallennustilasta."</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"Asenna varmenteet SD-kortilta."</string>
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Näytä vedettävällä ilmoitusalueella ja lukitusnäytöllä"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Näytä vedettävällä ilmoitusalueella ja tilapalkissa"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Näytä vedettävällä ilmoitusalueella, tilapalkissa ja lukitusnäytöllä"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Vilkuta valoa"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Lukitusnäyttö"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Lukitusnäytön ohittaminen"</string>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index d40c44d..848cd3f 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -413,7 +413,7 @@
     <item msgid="2484564813864139237">"RPV IPSec avec certificats et authentification Xauth"</item>
     <item msgid="68918911194507915">"RPV IPSec avec certificats et authentification hybride"</item>
     <item msgid="4631647675167100375">"RPV IKEv2/IPSec avec certificats et authentification par nom d\'utilisateur et mot de passe"</item>
-    <item msgid="8812228622975052811">"RPV IKEv2/IPSec avec clés pré-partagées"</item>
+    <item msgid="8812228622975052811">"RPV IKEv2/IPSec avec clés prépartagées"</item>
     <item msgid="6630554779981113046">"RPV IKEv2/IPSec avec certificats"</item>
   </string-array>
   <string-array name="vpn_proxy_settings">
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 14c5657..bb1b5b3 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"S\'affiche dans le volet déroulant et sur l\'écran de verrouillage"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"S\'affiche dans le volet déroulant et dans la barre d\'état"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"S\'affiche dans le volet déroulant, dans la barre d\'état et sur l\'écran de verrouillage"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Faire clignoter le voyant"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Écran de verrouillage"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ignorer l\'écran de verrouillage"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1d31759..895093b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"S\'affichent dans le volet des notifications et sur l\'écran de verrouillage"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"S\'affichent dans le volet des notifications et dans la barre d\'état"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"S\'affichent dans le volet des notifications, la barre d\'état et sur l\'écran de verrouillage"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Clignotement"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Écran de verrouillage"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Passer l\'écran de verrouillage"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 30fd692..8ee8d3a 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -784,7 +784,7 @@
     <string name="android_beam_off_summary" msgid="5693961375631325042">"Desactivado"</string>
     <string name="nfc_disabled_summary" msgid="8737797364522502351">"Non está dispoñible debido a que a opción NFC está desactivada"</string>
     <string name="android_beam_label" msgid="7168565080321110094">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="5684416131846701256">"Cando esta función está activada, podes transferir contido de aplicacións a outros dispositivos compatibles con NFC achegando os dispositivos entre si. Por exemplo, podes transmitir páxinas web, vídeos de YouTube, contactos, etc.\n\nSimplemente achega os dispositivos entre si (normalmente as súas partes posteriores) e, a continuación, toca a pantalla. A aplicación determina o que se transfire."</string>
+    <string name="android_beam_explained" msgid="5684416131846701256">"Cando esta función está activada, podes transferir contido de aplicacións a outros dispositivos compatibles con NFC achegando os dispositivos entre si. Por exemplo, podes transmitir páxinas web, vídeos de YouTube, contactos etc.\n\nSimplemente achega os dispositivos entre si (normalmente as súas partes posteriores) e, a continuación, toca a pantalla. A aplicación determina o que se transfire."</string>
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wifi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activar a wifi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wifi"</string>
@@ -1323,7 +1323,7 @@
     <string name="device_status_activity_title" msgid="1812666241137263882">"Estado"</string>
     <string name="device_status" msgid="7988547478034984649">"Estado"</string>
     <string name="device_status_summary" product="tablet" msgid="8826216824111648900">"Estado da batería, da rede e outra información"</string>
-    <string name="device_status_summary" product="default" msgid="8132661857066128832">"Número de teléfono, sinal, etc."</string>
+    <string name="device_status_summary" product="default" msgid="8132661857066128832">"Número de teléfono, sinal etc."</string>
     <string name="storage_settings" msgid="7472188817781592677">"Almacenamento"</string>
     <string name="storage_settings_for_app" msgid="229425418984637483">"Almacenamento e memoria caché"</string>
     <string name="storage_usb_settings" msgid="7058142934214211583">"Almacenamento"</string>
@@ -1374,7 +1374,7 @@
     <string name="memory_media_usage" msgid="5161308657995646963">"Multimedia"</string>
     <string name="memory_downloads_usage" msgid="8252462247720191179">"Descargas"</string>
     <string name="memory_dcim_usage" msgid="3568913845973164352">"Imaxes, vídeos"</string>
-    <string name="memory_music_usage" msgid="8100634000114206429">"Audio (música, tons de chamada, podcasts, etc.)"</string>
+    <string name="memory_music_usage" msgid="8100634000114206429">"Audio (música, tons de chamada, podcasts etc.)"</string>
     <string name="memory_media_misc_usage" msgid="7066851245178533269">"Outros ficheiros"</string>
     <string name="memory_media_cache_usage" msgid="780808666853685824">"Datos da caché"</string>
     <string name="sd_eject" product="nosdcard" msgid="6136102589751843304">"Desactivar almacenamento"</string>
@@ -1458,7 +1458,7 @@
     <string name="storage_detail_other" msgid="3821329310612285961">"Outro"</string>
     <string name="storage_detail_system" msgid="3797439069473271732">"Sistema"</string>
     <string name="storage_detail_explore" msgid="13782374784415466">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="3359851869961609901">"Na sección Outros inclúense os ficheiros compartidos que gardaron as aplicacións, os ficheiros descargados de Internet ou por Bluetooth, os ficheiros de Android, etc. \n\nPara ver o contido visible da <xliff:g id="NAME">^1</xliff:g>, toca Explorar."</string>
+    <string name="storage_detail_dialog_other" msgid="3359851869961609901">"Na sección Outros inclúense os ficheiros compartidos que gardaron as aplicacións, os ficheiros descargados de Internet ou por Bluetooth, os ficheiros de Android etc. \n\nPara ver o contido visible da <xliff:g id="NAME">^1</xliff:g>, toca Explorar."</string>
     <string name="storage_detail_dialog_system" msgid="7461009051858709479">"O sistema inclúe arquivos usados para executar a versión <xliff:g id="VERSION">%s</xliff:g> de Android"</string>
     <string name="storage_detail_dialog_user" msgid="1691219071007313226">"É posible que <xliff:g id="USER_0">^1</xliff:g> gardase fotos, música, aplicacións ou outros datos que ocupan <xliff:g id="SIZE">^2</xliff:g> do almacenamento. \n\nPara ver máis detalles, cambia a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="9036374223934708619">"Configura a túa <xliff:g id="NAME">^1</xliff:g>"</string>
@@ -1869,7 +1869,7 @@
     <string name="internal_storage" msgid="999496851424448809">"Almacenamento interno"</string>
     <string name="recompute_size" msgid="1098091228370999128">"Recalculando o tamaño…"</string>
     <string name="clear_data_dlg_title" msgid="180446967743732410">"Eliminar os datos da aplicación?"</string>
-    <string name="clear_data_dlg_text" msgid="7870723948123690332">"Eliminaranse todos os datos desta aplicación permanentemente. Entre estes inclúense todos os ficheiros, opcións de configuracións, contas, bases de datos, etc."</string>
+    <string name="clear_data_dlg_text" msgid="7870723948123690332">"Eliminaranse todos os datos desta aplicación permanentemente. Entre estes inclúense todos os ficheiros, opcións de configuracións, contas, bases de datos etc."</string>
     <string name="dlg_ok" msgid="1421350367857960997">"Aceptar"</string>
     <string name="dlg_cancel" msgid="5164705061530774899">"Cancelar"</string>
     <string name="app_not_found_dlg_title" msgid="7122106240981109930"></string>
@@ -2708,7 +2708,7 @@
     <string name="sync_gmail" msgid="228561698646018808">"Gmail"</string>
     <string name="sync_calendar" msgid="4603704438090387251">"Calendario"</string>
     <string name="sync_contacts" msgid="2376465611511325472">"Contactos"</string>
-    <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Benvido á sincronización de Google."</font>" \nUn método de Google que che permite sincronizar datos para que poidas acceder aos teus contactos, citas, etc. esteas onde esteas."</string>
+    <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Benvido á sincronización de Google."</font>" \nUn método de Google que che permite sincronizar datos para que poidas acceder aos teus contactos, citas etc. esteas onde esteas."</string>
     <string name="header_application_sync_settings" msgid="7427706834875419243">"Configuración da sincronización de aplicacións"</string>
     <string name="header_data_and_synchronization" msgid="453920312552838939">"Datos e sincronización"</string>
     <string name="preference_change_password_title" msgid="5465821666939825972">"Cambiar contrasinal"</string>
@@ -2965,7 +2965,7 @@
     <string name="user_add_user_item_title" msgid="7113492080980313503">"Usuario"</string>
     <string name="user_add_profile_item_title" msgid="4277967199592309233">"Perfil restrinxido"</string>
     <string name="user_add_user_title" msgid="5935443242986169507">"Engadir un usuario novo?"</string>
-    <string name="user_add_user_message_long" msgid="5701401361311414925">"Podes compartir este dispositivo con outras persoas a través da creación de usuarios adicionais. Cada usuario ten o seu propio espazo que pode personalizar coas súas propias aplicacións, fondos de pantalla, etc. Os usuarios tamén poden modificar as opcións de configuración do dispositivo, como a rede wifi, que afectan a todo o mundo.\n\nCando engadas un usuario novo, este deberá configurar o seu espazo.\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios. Non se poden transferir ao novo usuario os servizos nin a configuración de accesibilidade."</string>
+    <string name="user_add_user_message_long" msgid="5701401361311414925">"Podes compartir este dispositivo con outras persoas a través da creación de usuarios adicionais. Cada usuario ten o seu propio espazo que pode personalizar coas súas propias aplicacións, fondos de pantalla etc. Os usuarios tamén poden modificar as opcións de configuración do dispositivo, como a rede wifi, que afectan a todo o mundo.\n\nCando engadas un usuario novo, este deberá configurar o seu espazo.\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios. Non se poden transferir ao novo usuario os servizos nin a configuración de accesibilidade."</string>
     <string name="user_add_user_message_short" msgid="6053863324581258810">"Cando engadas un usuario novo, este deberá configurar o seu espazo.\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios."</string>
     <string name="user_setup_dialog_title" msgid="7570750684073382843">"Configurar o usuario agora?"</string>
     <string name="user_setup_dialog_message" msgid="7816549760544326181">"Asegúrate de que a persoa está dispoñible para acceder ao dispositivo e configurar o seu espazo"</string>
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Mostrar no panel despregable e na pantalla de bloqueo"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Mostrar no panel despregable e na barra de estado"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Mostrar no panel despregable, na barra de estado e na pantalla de bloqueo"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Luz intermitente"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Pantalla de bloqueo"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Omitir a pantalla de bloqueo"</string>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index cf3be5b..7a57c41 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -405,9 +405,17 @@
     <item msgid="2836895041823327816">"વાદળી પર પીળી"</item>
     <item msgid="747238414788976867">"કસ્ટમ"</item>
   </string-array>
-    <!-- no translation found for vpn_types_long:6 (4631647675167100375) -->
-    <!-- no translation found for vpn_types_long:7 (8812228622975052811) -->
-    <!-- no translation found for vpn_types_long:8 (6630554779981113046) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6621806338070912611">"PPTP VPN"</item>
+    <item msgid="2552427673212085780">"પહેલાંથી શેર કરેલ કીઝ સાથે L2TP/IPSec VPN"</item>
+    <item msgid="7378096704485168082">"પ્રમાણપત્રો સાથે L2TP/IPSec VPN"</item>
+    <item msgid="3792393562235791509">"પૂર્વ શેર કરેલી કીઝ અને Xauth પ્રમાણીકરણ સાથે IPSec VPN"</item>
+    <item msgid="2484564813864139237">"પ્રમાણપત્રો અને Xauth પ્રમાણીકરણ સાથે IPSec VPN"</item>
+    <item msgid="68918911194507915">"પ્રમાણપત્રો અને સંકર પ્રમાણીકરણ સાથે IPSec VPN"</item>
+    <item msgid="4631647675167100375">"પ્રમાણપત્રો અને વપરાશકર્તાનું નામ/પાસવર્ડના પ્રમાણીકરણ સાથે IKEv2/IPSec VPN"</item>
+    <item msgid="8812228622975052811">"પહેલાંથી શેર કરેલી કી સાથે L2TP/IPSec VPN"</item>
+    <item msgid="6630554779981113046">"પ્રમાણપત્રો સાથે IKEv2/IPSec VPN"</item>
+  </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="7165538292837266997">"એકપણ નહીં"</item>
     <item msgid="2397017538263427575">"મૅન્યુઅલ"</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 8d7ee9d..4db9752 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"નીચે દેખાતા શેડમાં અને લૉક સ્ક્રીનમાં બતાવો"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"નીચે દેખાતા શેડમાં અને સ્ટેટસ બારમાં બતાવો"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"નીચે દેખાતા શેડ, સ્ટેટસ બાર અને લૉક સ્ક્રીનમાં બતાવો"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"લાઇટ ઝબકવી"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"લૉક સ્ક્રીન"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"લૉક સ્ક્રીન છોડો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 1daaa59..19e6475 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"नीचे खींचने वाली सूची और लॉक स्क्रीन पर दिखाएं"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"नीचे खींचने वाली सूची और स्टेटस बार पर दिखाएं"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"नीचे खींचने वाली सूची, स्टेटस बार और लॉक स्क्रीन पर दिखाएं"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"ब्लिंक लाइट"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"लॉक स्क्रीन"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"लॉक स्क्रीन छोड़कर आगे बढ़ें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 341e287..15e8f85 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -3482,6 +3482,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Prikaži na zaslonu obavijesti i zaključanom zaslonu"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Prikaži na zaslonu obavijesti i traci statusa"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Prikaži na zaslonu obavijesti, traci statusa i zaključanom zaslonu"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Trepereće svjetlo"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Na zaključanom zaslonu"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskoči zaključan zaslon"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8836b06..3957b99 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Megjelenítés a lehúzható értesítési felületen és a lezárási képernyőn"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Megjelenítés a lehúzható értesítési felületen és az állapotsoron"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Megjelenítés a lehúzható értesítések között, az állapotsoron és a lezárási képernyőn"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Villogó fény"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Lezárási képernyő"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Lezárási képernyő kihagyása"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 62eb3d2..81184ed 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Ցուցադրել իջնող վահանակի վրա և կողպէկրանին"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Ցուցադրել իջնող վահանակի վրա և կարգավիճակի գոտում"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Ցուցադրել իջնող վահանակի վրա, կարգավիճակի գոտում և կողպէկրանին"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Թարթող լույս"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Կողպէկրան"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Բաց թողնել կողպէկրանը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5ba3411..2301b41 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Ditampilkan di bayangan pull-down &amp; di layar kunci"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Ditampilkan di bayangan pull-down &amp; status bar"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Ditampilkan di bayangan pull-down, status bar &amp; di layar kunci"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Cahaya kedip"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Layar kunci"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Lewati layar kunci"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 45a2387..7ca4a69 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Birtist á fellisvæði og lásskjá"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Birtist á fellisvæði og stöðustiku"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Birta á fellisvæði, stöðustiku og lásskjá"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blikkandi ljós"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Lásskjár"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Sleppa lásskjá"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c7ad9ee..6e18a80 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Verranno visualizzate nell\'area a discesa e nella schermata di blocco"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Verranno visualizzate nell\'area a discesa e nella barra di stato"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Verranno visualizzate nell\'area a discesa, nella barra di stato e nella schermata di blocco"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Luce lampeggiante"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Schermata di blocco"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ignorare schermata di blocco"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f1c9eb4..17ff7e4 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -3530,6 +3530,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"מוצגות בלוח ההתראות הנפתח ובמסך הנעילה"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"מוצגות בלוח ההתראות הנפתח ובשורת הסטטוס"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"מוצגות בלוח ההתראות הנפתח, בשורת הסטטוס ובמסך הנעילה"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"אור מהבהב"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"מסך נעילה"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"דילוג על מסך הנעילה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 85786c8..d5d9608 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"プルダウン シェードとロック画面に表示されます"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"プルダウン シェードとステータスバーに表示されます"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"プルダウン シェード、ステータスバー、ロック画面に表示されます"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"点滅"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"ロック画面"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ロック画面をスキップ"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index b967e0a..10139ae 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"გამოჩნდება ჩამოსაწევ ფარდაში და ჩაკეტილ ეკრანზე"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"გამოჩნდება ჩამოსაწევ ფარდაში და სტატუსის ზოლში"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"გამოჩნდება ჩამოსაწევ ფარდაში, სტატუსის ზოლში და ჩაკეტილ ეკრანზე"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"სინათლის ციმციმი"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"ჩაკეტილი ეკრანი"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ჩაკეტილი ეკრანის გამოტოვება"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 38733e9..fd10401 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Хабарландырулар ашылмалы панельге немесе құлыптаулы экранға шығады."</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Хабарландырулар ашылмалы панельге және күй жолағына шығады."</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Ашылмалы панельге, күй жолағына және құлыптаулы экранға шығады."</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Жыпылықтаған жарық"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Құлыптаулы экран"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Экран құлпын өткізіп жіберу"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index d2f8a82..70d9222 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"បង្ហាញ​នៅក្នុងផ្ទាំងជូនដំណឹង​ធ្លាក់ចុះ និងនៅលើ​អេក្រង់ចាក់សោ"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"បង្ហាញ​នៅក្នុងផ្ទាំងជូនដំណឹង​ធ្លាក់ចុះ និងរបារ​ស្ថានភាព"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"បង្ហាញ​នៅក្នុងផ្ទាំងជូនដំណឹង​ធ្លាក់ចុះ របារ​ស្ថានភាព និងនៅលើ​អេក្រង់ចាក់សោ"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"ភ្លើងលោត"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"អេក្រង់ចាក់សោ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"រំលង​អេក្រង់ចាក់សោ"</string>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index 5996d87..1506bd0 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -405,9 +405,17 @@
     <item msgid="2836895041823327816">"ನೀಲಿ ಬಣ್ಣದಲ್ಲಿ ಹಳದಿ"</item>
     <item msgid="747238414788976867">"ಕಸ್ಟಮ್"</item>
   </string-array>
-    <!-- no translation found for vpn_types_long:6 (4631647675167100375) -->
-    <!-- no translation found for vpn_types_long:7 (8812228622975052811) -->
-    <!-- no translation found for vpn_types_long:8 (6630554779981113046) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6621806338070912611">"PPTP VPN"</item>
+    <item msgid="2552427673212085780">"ಪೂರ್ವ-ಹಂಚಿಕೆಯಾದ ಕೀಗಳನ್ನು ಹೊಂದಿರುವ L2TP/IPSec VPN"</item>
+    <item msgid="7378096704485168082">"ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಹೊಂದಿರುವ L2TP/IPSec VPN"</item>
+    <item msgid="3792393562235791509">"ಪೂರ್ವ-ಹಂಚಿಕೆಯಾದ ಕೀಗಳು ಮತ್ತು Xauth ಪ್ರಮಾಣೀಕರಣವನ್ನು ಹೊಂದಿರುವ IPSec VPN"</item>
+    <item msgid="2484564813864139237">"ಪ್ರಮಾಣಪತ್ರಗಳು ಮತ್ತು Xauth ಪ್ರಮಾಣೀಕರಣವನ್ನು ಹೊಂದಿರುವ IPSec VPN"</item>
+    <item msgid="68918911194507915">"ಪ್ರಮಾಣಪತ್ರಗಳು ಮತ್ತು ಹೈಬ್ರಿಡ್ ಪ್ರಮಾಣೀಕರಣವನ್ನು ಹೊಂದಿರುವ IPSec VPN"</item>
+    <item msgid="4631647675167100375">"ಪ್ರಮಾಣಪತ್ರಗಳು ಮತ್ತು ಬಳಕೆದಾರರ ಹೆಸರು/ಪಾಸ್‌ವರ್ಡ್ ಪ್ರಮಾಣೀಕರಣವನ್ನು ಹೊಂದಿರುವ IKEv2/IPSec VPN"</item>
+    <item msgid="8812228622975052811">"ಮೊದಲೇ ಹಂಚಿಕೊಂಡ ಕೀಗಳನ್ನು ಹೊಂದಿರುವ IKEv2/IPSec VPN"</item>
+    <item msgid="6630554779981113046">"ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಹೊಂದಿರುವ IKEv2/IPSec VPN"</item>
+  </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="7165538292837266997">"ಯಾವುದೂ ಇಲ್ಲ"</item>
     <item msgid="2397017538263427575">"ಹಸ್ತಚಾಲಿತ"</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index b235422..f346145 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"ಪುಲ್-ಡೌನ್ ಶೇಡ್‌ನಲ್ಲಿ ಮತ್ತು ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಮೇಲೆ ಡಿಸ್‌ಪ್ಲೇ ಆಗುತ್ತದೆ"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"ಪುಲ್-ಡೌನ್ ಶೇಡ್‌ನಲ್ಲಿ ಮತ್ತು ಸ್ಥಿತಿ ಪಟ್ಟಿಯಲ್ಲಿ ಡಿಸ್‌ಪ್ಲೇ ಆಗುತ್ತದೆ"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ಪುಲ್-ಡೌನ್ ಶೇಡ್‌ನಲ್ಲಿ, ಸ್ಥಿತಿ ಪಟ್ಟಿಯಲ್ಲಿ ಮತ್ತು ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಮೇಲೆ ಡಿಸ್‌ಪ್ಲೇ ಆಗುತ್ತದೆ"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"ಮಿನುಗುವ ಲೈಟ್‌"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"ಲಾಕ್ ಸ್ಕ್ರೀನ್"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e786096..99c3412 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"풀다운 창 및 잠금 화면에 표시됩니다."</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"풀다운 창 및 상태 표시줄에 표시됩니다."</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"풀다운 창, 상태 표시줄, 잠금 화면에 표시됩니다."</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"표시등 깜박임"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"잠금 화면"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"잠금 화면 건너뛰기"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index d337776..3d1db1d 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -387,7 +387,7 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Кулпну манж из менн ач"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Манжа изиңизди колдонуңуз"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="242123866344666054">"Телефонуңуздун кулпусун ачып, кандайдыр бир нерсени сатып алып жатканыңызды ырастап же колдонмолорго кирүү үчүн жөн гана манжаңызды сенсорго тийгизип коюңуз. Кимдир-бирөөнүн манжа изин кошуп жатканыңызда этият болуңуз. Бир эле манжа изи кошулса да, ушул нерселердин бардыгын аткара алат.\n\nТүзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="242123866344666054">"Телефонуңуздун кулпусун ачып, кандайдыр бир нерсени сатып алып жатканыңызды ырастап же колдонмолорго кирүү үчүн жөн гана манжаңызды сенсорго тийгизип коюңуз. Кимдир-бирөөнүн манжа изин кошуп жатканыңызда этият болуңуз. Бир эле манжа изи кошулса да, ушул нерселердин баарын аткара алат.\n\nТүзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Телефонуңуздун кулпусун ачуу же сатып алууларды ырастоо үчүн манжа изиңизди пайдаланыңыз.\n\nЭскертүү: Манжа изиңизди бул түзмөктүн кулпусун ачууга колдоно албайсыз. Кеңири маалымат үчүн ишканаңыздын администраторуна кайрылыңыз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Телефонуңуздун кулпусун ачуу же сатып алууларды ырастоо үчүн манжа изиңизди пайдаланыңыз.\n\nЭскертүү: Түзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Жокко чыгаруу"</string>
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Тигинен жайгашкан экранда жана кулпуланган экранда чагылдыруу"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Тигинен жайгашкан экранда жана абал тилкесинде чагылдыруу"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Тигинен жайгашкан экранда, абал тилкесинде жана кулпуланган экранда чагылдыруу"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Жарык индикатору"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Кулпуланган экран"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Экран кулпуcун өткөрүп жиберүү"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 7ceb370..4b6fbc9 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"ສະແດງໃນແຖບແບບດຶງລົງ ແລະ ໃນໜ້າຈໍລັອກ"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"ສະແດງໃນແຖບແບບເລື່ອນລົງ ແລະ ແຖບສະຖານະ"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ສະແດງໃນແຖບແບບເລື່ອນລົງ, ແຖບສະຖານະ ແລະ ຢູ່ໜ້າຈໍລັອກ"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"ກະພິບໄຟ"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"ໜ້າຈໍລັອກ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ຂ້າມໜ້າຈໍລັອກ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 88eccb4..9f0bf18 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -3528,6 +3528,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Pateikti išskleidžiamajame skydelyje ir užrakinimo ekrane"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Pateikti išskleidžiamajame skydelyje ir būsenos juostoje"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Pateikti išskleidžiamajame skydelyje, būsenos juostoje ir užrakinimo ekrane"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Mirksinti šviesa"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Užrakinimo ekranas"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Praleisti užrakinimo ekraną"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 35b894d..aa95bf3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -3482,6 +3482,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Rādīt nolaižamajā panelī un bloķēšanas ekrānā"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Rādīt nolaižamajā panelī un statusa joslā"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Rādīt nolaižamajā panelī, statusa joslā un bloķēšanas ekrānā"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Mirgojošs gaismas signāls"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Bloķēšanas ekrāns"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Izlaist bloķēšanas ekrānu"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index afd1c27..2199094 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Прикажи во списокот со известувања и на заклучен екран"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Прикажи во списокот со известувања и на статусната лента"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Прикажи во списокот со известувања, на статусната лента и на заклучен екран"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Трепкај со сијаличката"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Заклучен екран"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Прескокнување заклучен екран"</string>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 999cd88..b46013d 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -405,9 +405,17 @@
     <item msgid="2836895041823327816">"നീലയിൽ മഞ്ഞ"</item>
     <item msgid="747238414788976867">"ഇഷ്‌ടാനുസൃതം"</item>
   </string-array>
-    <!-- no translation found for vpn_types_long:6 (4631647675167100375) -->
-    <!-- no translation found for vpn_types_long:7 (8812228622975052811) -->
-    <!-- no translation found for vpn_types_long:8 (6630554779981113046) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6621806338070912611">"PPTP VPN"</item>
+    <item msgid="2552427673212085780">"മുമ്പ് പങ്കിട്ട കീകൾ ഉപയോഗിക്കുന്ന L2TP/IPSec VPN"</item>
+    <item msgid="7378096704485168082">"സർട്ടിഫിക്കറ്റുകൾ ഉപയോഗിക്കുന്ന L2TP/IPSec VPN"</item>
+    <item msgid="3792393562235791509">"മുമ്പ് പങ്കിട്ട കീകളും Xauth പ്രമാണീകരണവും ഉപയോഗിക്കുന്ന IPSec VPN"</item>
+    <item msgid="2484564813864139237">"സർട്ടിഫിക്കറ്റുകളും Xauth പ്രമാണീകരണവും ഉപയോഗിക്കുന്ന IPSec VPN"</item>
+    <item msgid="68918911194507915">"സർട്ടിഫിക്കറ്റുകളും ഹൈബ്രിഡ് പ്രാമാണീകരണവുമുള്ള IPSec VPN"</item>
+    <item msgid="4631647675167100375">"സർട്ടിഫിക്കറ്റുകൾ, പരിശോധിച്ചുറപ്പിച്ച ഉപയോക്തൃനാമം/പാസ്‍വേഡ് എന്നിവയോട് കൂടിയ IKEv2/IPSec VPN"</item>
+    <item msgid="8812228622975052811">"മുമ്പേ പങ്കിട്ട കീകളോട് കൂടിയ IKEv2/IPSec VPN"</item>
+    <item msgid="6630554779981113046">"സർട്ടിഫിക്കറ്റുകളോട് കൂടിയ IKEv2/IPSec VPN"</item>
+  </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="7165538292837266997">"ഒന്നുമില്ല"</item>
     <item msgid="2397017538263427575">"മാനുവൽ"</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index ec1a03c..41a3162 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"പുൾ ഡൗൺ ഷെയ്‌ഡിലും ലോക്ക് സ്ക്രീനിലും പ്രദർശിപ്പിക്കുക"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"പുൾ ഡൗൺ ഷെയ്‌ഡിലും സ്‌റ്റാറ്റസ് ബാറിലും പ്രദർശിപ്പിക്കുക"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"പുൾ ഡൗൺ ഷെയ്‌ഡിലും സ്‌റ്റാറ്റസ് ബാറിലും ലോക്ക് സ്ക്രീനിലും പ്രദർശിപ്പിക്കുക"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"ലൈറ്റ് മിന്നുക"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"ലോക്ക് സ്‌ക്രീൻ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ലോക്ക് സ്‌ക്രീൻ ഒഴിവാക്കുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index e7820aa..96fcb98 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Доош татдаг сүүдэрт болон түгжигдсэн дэлгэцэд харагдана"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Доош татдаг сүүдэр болон статусын хэсэгт харагдана"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Доош татдаг сүүдэр, статусын хэсэг болон түгжигдсэн дэлгэцэд харагдана."</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Анивчих гэрэл"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Түгжигдсэн дэлгэц"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Түгжигдсэн дэлгэцийг алгасах"</string>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index c20647b..f58187a 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -405,9 +405,17 @@
     <item msgid="2836895041823327816">"निळ्यावर पिवळे"</item>
     <item msgid="747238414788976867">"कस्टम"</item>
   </string-array>
-    <!-- no translation found for vpn_types_long:6 (4631647675167100375) -->
-    <!-- no translation found for vpn_types_long:7 (8812228622975052811) -->
-    <!-- no translation found for vpn_types_long:8 (6630554779981113046) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6621806338070912611">"PPTP VPN"</item>
+    <item msgid="2552427673212085780">"पूर्व-शेअर की सह L2TP/IPSec VPN"</item>
+    <item msgid="7378096704485168082">"प्रमाणपत्रांसह L2TP/IPSec VPN"</item>
+    <item msgid="3792393562235791509">"पूर्व-शेअर की आणि Xauth प्रमाणीकरणासह IPSec VPN"</item>
+    <item msgid="2484564813864139237">"प्रमाणपत्रे आणि Xauth प्रमाणीकरणासह IPSec VPN"</item>
+    <item msgid="68918911194507915">"प्रमाणपत्रे आणि संकरित प्रमाणीकरणासह IPSec VPN"</item>
+    <item msgid="4631647675167100375">"प्रमाणपत्र आणि वापरकर्ता नाव/पासवर्ड ऑथेंटिकेशनसह IKEv2/IPSec VPN"</item>
+    <item msgid="8812228622975052811">"आधीच शेअर केलेली कीसह IKEv2/IPSec VPN"</item>
+    <item msgid="6630554779981113046">"प्रमाणपत्रांसह IKEv2/IPSec VPN"</item>
+  </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="7165538292837266997">"काहीही नाही"</item>
     <item msgid="2397017538263427575">"मॅन्युअल"</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 4709c6d..bd2cc9e 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -3437,6 +3437,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"पूल-डाउन शेडमध्ये आणि लॉक स्क्रीनवर दाखवा"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"पूल-डाउन शेड आणि स्टेटस बारमध्ये दाखवा"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"पूल-डाउन शेडमध्ये, स्टेटस बारमध्ये आणि लॉक स्क्रीनवर दाखवा"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"ब्लिंक लाइट"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"लॉक स्क्रीन"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"लॉक स्क्रीन वगळा"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index bbbec01..7a5066b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Paparkan dalam bidai tarik turun &amp; pada skrin kunci"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Paparkan dalam bidai tarik turun &amp; bar status"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Paparkan dalam bidai tarik turun, bar status &amp; pada skrin kunci"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Lampu berkelip"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Skrin kunci"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Langkau skrin kunci"</string>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 6f096bd..f98d455 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -405,9 +405,17 @@
     <item msgid="2836895041823327816">"အပြာပေါ်အဝါ"</item>
     <item msgid="747238414788976867">"စိတ်ကြိုက်"</item>
   </string-array>
-    <!-- no translation found for vpn_types_long:6 (4631647675167100375) -->
-    <!-- no translation found for vpn_types_long:7 (8812228622975052811) -->
-    <!-- no translation found for vpn_types_long:8 (6630554779981113046) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6621806338070912611">"PPTP VPN"</item>
+    <item msgid="2552427673212085780">"ကြိုတင် ပေးထားတဲ့ ကီးပါရှိသောL2TP/IPSec VPN"</item>
+    <item msgid="7378096704485168082">"အသိအမှတ်ပြုလက်မှတ်ပါရှိသောL2TP/IPSec VPN"</item>
+    <item msgid="3792393562235791509">"ကြိုတင်ပေးထားတဲ့ ကီးနှင့်Xauthစစ်မှန်ကြောင်းပါရှိသောIPSec VPN"</item>
+    <item msgid="2484564813864139237">"အသိအမှတ်ပြုလက်မှတ်နှင့်Xauthစစ်မှန်ကြောင်းပါရှိသောIPSec VPN"</item>
+    <item msgid="68918911194507915">"အသိအမှတ်ပြုလက်မှတ်များနှင့် ရောနှောထားတဲ့ စစ်မှန်ကြောင်းပါရှိသောIPSec VPN"</item>
+    <item msgid="4631647675167100375">"အသိအမှတ်ပြုလက်မှတ်များနှင့် အသုံးပြုသူအမည်/စကားဝှက် အထောက်အထားစိစစ်ခြင်းများပါသော IKEv2/IPSec VPN"</item>
+    <item msgid="8812228622975052811">"ကြိုတင်မျှဝေထားသော ကီးများပါသော IKEv2/IPSec VPN"</item>
+    <item msgid="6630554779981113046">"အသိအမှတ်ပြုလက်မှတ်များပါသော IKEv2/IPSec VPN"</item>
+  </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="7165538292837266997">"မရှိ"</item>
     <item msgid="2397017538263427575">"ကိုယ်တိုင်"</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 5ab9873..fb83899 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"ဆွဲချစာရင်းနှင့် လော့ခ်ချထားသည့်မျက်နှာပြင်တွင် ပြသပါ"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"ဆွဲချစာရင်းနှင့် အခြေအနေပြနေရာတွင် ပြသပါ"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ဆွဲချစာရင်း၊ အခြေအနေပြနေရာနှင့် လော့ခ်ချထားသည့် မျက်နှာပြင်တွင် ပြသပါ"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"မီး မှိတ်တုတ်မှိတ်တုတ်လုပ်ရန်"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"လော့ခ်ချထားချိန် မျက်နှာပြင်"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"လော့ခ်ချမျက်နှာပြင် ကျော်ရန်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 235b184..cd2cc40 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Vis i nedtrekkspanelet og på låseskjermen"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Vis i nedtrekkspanelet og statusfeltet"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Vis i nedtrekkspanelet, statusfeltet og på låseskjermen"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blinkende lys"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Låseskjerm"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Hopp over låseskjermen"</string>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index eb4d4c5..af4c0e0 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -405,9 +405,17 @@
     <item msgid="2836895041823327816">"नीलोमा पहेँलो"</item>
     <item msgid="747238414788976867">"आफू अनुकूल"</item>
   </string-array>
-    <!-- no translation found for vpn_types_long:6 (4631647675167100375) -->
-    <!-- no translation found for vpn_types_long:7 (8812228622975052811) -->
-    <!-- no translation found for vpn_types_long:8 (6630554779981113046) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6621806338070912611">"PPTP VPN"</item>
+    <item msgid="2552427673212085780">"L2TP/IPSec VPN पूर्व साझेदारी कुञ्जीकासँग"</item>
+    <item msgid="7378096704485168082">"प्रमाणपत्रहरूसँग L2TP/IPSec VPN"</item>
+    <item msgid="3792393562235791509">"IPSec VPN पूर्व साझेदारी कुञ्जी र Xauth प्राधिकरणसँग"</item>
+    <item msgid="2484564813864139237">"प्रमाणपत्रहरू र Xauth प्रमाणीकरणको साथ IPSec VPN"</item>
+    <item msgid="68918911194507915">"प्रमाणपत्रहरू र हाईब्रिड प्रमाणीकरणसँग IPSec VPN"</item>
+    <item msgid="4631647675167100375">"प्रमाणपत्रहरू र पासवर्ड प्रमाणीकरणसहितको IKEv2/IPSec VPN"</item>
+    <item msgid="8812228622975052811">"पहिले नै आदान प्रदान गरिएका साँचाहरूसहितको L2TP/IPSec VPN"</item>
+    <item msgid="6630554779981113046">"प्रमाणपत्रहरूसहितको IKEv2/IPSec VPN"</item>
+  </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="7165538292837266997">"कुनै पनि होइन"</item>
     <item msgid="2397017538263427575">"म्यानुअल"</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index cadb4cd..0987e84 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"पुल डाउन सेड र लक स्क्रिनमा देखाउनुहोस्"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"पुल डाउन सेड र वस्तुस्थिति पट्टीमा देखाउनुहोस्"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"पुल डाउन सेड, वस्तुस्थिति पट्टी र लक स्क्रिनमा देखाउनुहोस्"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"झिम झिम गर्ने बत्ती"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"लक स्क्रिन"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"लक स्क्रिन छाड्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4201fb9..e41722f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Weergeven in pull-downvenster en op vergrendelingsscherm"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Weergeven in pull-downvenster en statusbalk"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Weergeven in pull-downvenster, statusbalk en op vergrendelingsscherm"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Knipperlicht"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Vergrendelingsscherm"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Vergrendelingsscherm overslaan"</string>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index 7d52ac5..6ddfd83 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -405,9 +405,17 @@
     <item msgid="2836895041823327816">"ନୀଳ ଉପରେ ହଳଦିଆ"</item>
     <item msgid="747238414788976867">"କଷ୍ଟମ୍‌"</item>
   </string-array>
-    <!-- no translation found for vpn_types_long:6 (4631647675167100375) -->
-    <!-- no translation found for vpn_types_long:7 (8812228622975052811) -->
-    <!-- no translation found for vpn_types_long:8 (6630554779981113046) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6621806338070912611">"PPTP VPN"</item>
+    <item msgid="2552427673212085780">"ପୂର୍ବରୁ ସେୟାର୍‌ ହୋଇଥିବା କୀଗୁଡ଼ିକ ସହ L2TP/IPSec VPN"</item>
+    <item msgid="7378096704485168082">"ସର୍ଟିଫିକେଟ୍‌ ସହ L2TP/IPSec VPN"</item>
+    <item msgid="3792393562235791509">"ସେୟାର୍‌ କରାଯାଇଥିବା କୀ’ଗୁଡ଼ିକ ସହିତ IPSec VPN ଏବଂ Xauth ସତ୍ୟାପନ"</item>
+    <item msgid="2484564813864139237">"ସର୍ଟିଫିକେଟ୍‌ ଏବଂ Xauth ପ୍ରାମାଣିକୀକରଣ ସହ IPSec VPN"</item>
+    <item msgid="68918911194507915">"ସର୍ଟିଫିକେଟ୍‌ ଓ ହାଇବ୍ରିଡ୍‌ ସତ୍ୟାପନ ସହ IPSec VPN"</item>
+    <item msgid="4631647675167100375">"ସାର୍ଟିଫିକେଟଗୁଡ଼ିକ ଏବଂ ଉପଯୋଗକର୍ତ୍ତାନାମ/ପାସୱାର୍ଡ ପ୍ରାମାଣିକତା ସହ IKEv2/IPSec VPN"</item>
+    <item msgid="8812228622975052811">"ପୂର୍ବରୁ ସେୟାର୍ କରାଯାଇଥିବା କୀଗୁଡ଼ିକ ସହ IKEv2/IPSec VPN"</item>
+    <item msgid="6630554779981113046">"ସାର୍ଟିଫିକେଟଗୁଡ଼ିକ ସହ IKEv2/IPSec VPN"</item>
+  </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="7165538292837266997">"କିଛିନାହିଁ"</item>
     <item msgid="2397017538263427575">"ମାନୁଆଲ୍"</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 174d0aa..914dd7b 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"ପୁଲ୍-ଡାଉନ୍ ସେଡ୍ ଏବଂ ଲକ୍ ସ୍କ୍ରିନ୍‌ରେ ପ୍ରଦର୍ଶିତ କରନ୍ତୁ"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"ପୁଲ୍-ଡାଉନ୍ ସେଡ୍ ଏବଂ ଷ୍ଟାଟସ୍‌ ବାର୍ ପ୍ରଦର୍ଶନ କରନ୍ତୁ"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ପୁଲ୍-ଡାଉନ୍ ସେଡ୍, ଷ୍ଟାଟସ୍ ବାର୍ ଏବଂ ଲକ୍ ସ୍କ୍ରିନ୍‌ରେ ପ୍ରଦର୍ଶନ କରନ୍ତୁ"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"ଆଲୋକକୁ ଧପଧପ କର"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"ଲକ୍ ସ୍କ୍ରିନ୍"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ଲକ୍ ସ୍କ୍ରିନ୍‍କୁ ବାଦ୍ ଦିଅନ୍ତୁ"</string>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index e045f14..2dce7dc 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -405,9 +405,17 @@
     <item msgid="2836895041823327816">"ਨੀਲੇ \'ਤੇ ਪੀਲਾ"</item>
     <item msgid="747238414788976867">"ਵਿਉਂਂਤੀ"</item>
   </string-array>
-    <!-- no translation found for vpn_types_long:6 (4631647675167100375) -->
-    <!-- no translation found for vpn_types_long:7 (8812228622975052811) -->
-    <!-- no translation found for vpn_types_long:8 (6630554779981113046) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6621806338070912611">"PPTP VPN"</item>
+    <item msgid="2552427673212085780">"ਪ੍ਰੀ-ਸ਼ੇਅਰ ਕੀਤੀਆਂ ਕੁੰਜੀਆਂ ਨਾਲ L2TP/IPSec VPN"</item>
+    <item msgid="7378096704485168082">"ਸਰਟੀਫਿਕੇਟਾਂ ਨਾਲ L2TP/IPSec VPN"</item>
+    <item msgid="3792393562235791509">"ਪ੍ਰੀ-ਸ਼ੇਅਰਡ ਕੁੰਜੀਆਂ ਅਤੇ Xauth ਪ੍ਰਮਾਣੀਕਰਨ ਨਾਲ IPSec VPN"</item>
+    <item msgid="2484564813864139237">"ਸਰਟੀਫਿਕੇਟਾਂ ਨਾਲ IPSec VPN ਅਤੇ Xauth ਪ੍ਰਮਾਣੀਕਰਨ"</item>
+    <item msgid="68918911194507915">"ਸਰਟੀਫਿਕੇਟਾਂ ਅਤੇ ਹਾਈਬ੍ਰਿਡ ਪ੍ਰਮਾਣੀਕਰਨ ਨਾਲ IPSec VPN"</item>
+    <item msgid="4631647675167100375">"ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਅਤੇ ਵਰਤੋਂਕਾਰ ਨਾਮ/ਪਾਸਵਰਡ ਪ੍ਰਮਾਣੀਕਰਨ ਨਾਲ IKEv2/IPSec VPN"</item>
+    <item msgid="8812228622975052811">"ਪਹਿਲਾਂ ਤੋਂ ਸਾਂਝੀਆਂ ਕੀਤੀ ਕੁੰਜੀਆਂ ਨਾਲ IKEv2/IPSec VPN"</item>
+    <item msgid="6630554779981113046">"ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਨਾਲ IKEv2/IPSec VPN"</item>
+  </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="7165538292837266997">"ਕੋਈ ਨਹੀਂ"</item>
     <item msgid="2397017538263427575">"ਹੱਥੀਂ"</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index eb5b487..1e96c3a 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"ਹੇਠਾਂ ਖਿੱਚੀ ਜਾਣ ਵਾਲੀ ਸੂਚੀ ਅਤੇ ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਸਦੀਆਂ ਹਨ"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"ਹੇਠਾਂ ਖਿੱਚੀ ਜਾਣ ਵਾਲੀ ਸੂਚੀ ਅਤੇ ਸਥਿਤੀ ਪੱਟੀ \'ਤੇ ਦਿਸਦੀਆਂ ਹਨ"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ਹੇਠਾਂ ਖਿੱਚੀ ਜਾਣ ਵਾਲੀ ਸੂਚੀ, ਸਥਿਤੀ ਪੱਟੀ ਅਤੇ ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਸਦੀਆਂ ਹਨ"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"ਲਾਈਟ ਨੂੰ ਟਿਮ-ਟਿਮਾਓ"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"ਲਾਕ ਸਕ੍ਰੀਨ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ਲਾਕ ਸਕ੍ਰੀਨ ਛੱਡੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7758e2f..6101a6d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1366,9 +1366,9 @@
     <string name="device_status" msgid="7988547478034984649">"Stan telefonu"</string>
     <string name="device_status_summary" product="tablet" msgid="8826216824111648900">"Stan baterii, sieci i inne informacje"</string>
     <string name="device_status_summary" product="default" msgid="8132661857066128832">"Numer telefonu, sygnał itd."</string>
-    <string name="storage_settings" msgid="7472188817781592677">"Pamięć"</string>
+    <string name="storage_settings" msgid="7472188817781592677">"Pamięć wewnętrzna"</string>
     <string name="storage_settings_for_app" msgid="229425418984637483">"Pamięć i pamięć podręczna"</string>
-    <string name="storage_usb_settings" msgid="7058142934214211583">"Pamięć"</string>
+    <string name="storage_usb_settings" msgid="7058142934214211583">"Pamięć wewnętrzna"</string>
     <string name="storage_settings_title" msgid="486118156723194815">"Ustawienia pamięci"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3858049818577638926">"Odłącz nośnik USB i wyświetl ilość dostępnej pamięci"</string>
     <string name="storage_settings_summary" product="default" msgid="267557695753980969">"Odłącz kartę SD, pokaż ilość dostępnej pamięci w telefonie"</string>
@@ -1851,7 +1851,7 @@
     <string name="advanced_settings" msgid="2368905204839169094">"Ustawienia zaawansowane"</string>
     <string name="advanced_settings_summary" msgid="1823765348195530035">"Włącz więcej opcji ustawień."</string>
     <string name="application_info_label" msgid="1015706497694165866">"Informacje o aplikacji"</string>
-    <string name="storage_label" msgid="2522307545547515733">"Pamięć"</string>
+    <string name="storage_label" msgid="2522307545547515733">"Pamięć wewnętrzna"</string>
     <string name="auto_launch_label" msgid="4069860409309364872">"Otwórz domyślnie"</string>
     <string name="auto_launch_label_generic" msgid="5033137408273064599">"Domyślne"</string>
     <string name="screen_compatibility_label" msgid="7549658546078613431">"Zgodność z ekranem"</string>
@@ -3528,6 +3528,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Wyświetlaj w obszarze powiadomień i na ekranie blokady"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Wyświetlaj w obszarze powiadomień i na pasku stanu"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Wyświetlaj w obszarze powiadomień, na pasku stanu i ekranie blokady"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Migająca dioda"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Ekran blokady"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Pomiń ekran blokady"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index dd3e610..f64ea6e 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Exibir na aba suspensa e na tela de bloqueio"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Exibir na aba suspensa e na barra de status"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Exibir na aba suspensa, barra de status e tela de bloqueio"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Piscar a luz"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Tela de bloqueio"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Pular tela de bloqueio"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index dbd4be1..2cc9599 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Apresentar no painel pendente e no ecrã de bloqueio"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Apresentar no painel pendente e na barra de estado"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Apresentar no painel pendente, na barra de estado e no ecrã de bloqueio"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Emitir luz intermitente"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Ecrã de bloqueio"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ignorar ecrã de bloqueio"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index dd3e610..f64ea6e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Exibir na aba suspensa e na tela de bloqueio"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Exibir na aba suspensa e na barra de status"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Exibir na aba suspensa, barra de status e tela de bloqueio"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Piscar a luz"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Tela de bloqueio"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Pular tela de bloqueio"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 60e61c5..2ee3404 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -3482,6 +3482,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Afișați în fereastra trasă în jos și pe ecranul de blocare"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Afișați în fereastra trasă în jos și în bara de stare"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Afișați în fereastra trasă în jos, bara de stare și ecranul de blocare"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Lumină intermitentă"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Ecran de blocare"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Omiteți ecranul de blocare"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b96e519..91120ef 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -3528,6 +3528,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Показывать на панели уведомлений и заблокированном экране"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Показывать на панели уведомлений и в строке состояния"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Показывать на панели уведомлений, в строке состояния и на заблокированном экране"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Световая индикация"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Заблокированный экран"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Пропуск экрана блокировки"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index d57d841..a7288da 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"පහළ ඇදීමේ සෙවන සහ අඟුලු තිරය මත සංදර්ශන කරයි"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"පහළ ඇදීමේ සෙවන සහ තත්ත්‍ව තීරුව තුළ සංදර්ශන කරයි"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"පහළ ඇදීමේ සෙවන, තත්ත්‍ව තීරුව තුළ සහ අඟුලු තිරය මත සංදර්ශන කරයි"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"නිවී නිවී දැල්වෙන එළිය"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"අඟුලු තිරය"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"අගුළු තිරය මඟ හරින්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 22c1e92..31271c7 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -3528,6 +3528,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Zobrazovať v rozbaľovacom paneli a na uzamknutej obrazovke"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Zobrazovať v rozbaľovacom paneli a stavovom riadku"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Zobrazovať v rozbaľovacom paneli, stavovom riadku a na uzamknutej obrazovke"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blikať"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Uzamknutá obrazovka"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskakovať uzamknutú obrazovku"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c4cc772..d6033f6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -3528,6 +3528,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Prikaz na poteznem zaslonu z obvestili in na zaklenjenem zaslonu"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Prikaz na poteznem zaslonu z obvestili in v vrstici stanja"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Prikaz na poteznem zaslonu z obvestili, v vrstici stanja in na zaklenjenem zaslonu"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Utripajoča lučka"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Na zaklenjenem zaslonu"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskok zaklenjenega zaslona"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index c7289f9..6b89653 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Shfaq në strehën me tërheqje poshtë dhe në ekranin e kyçjes"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Shfaq në strehën me tërheqje poshtë dhe shiritin e statusit"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Shfaq në strehën me tërheqje poshtë, shiritin e statusit dhe në ekranin e kyçjes"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Drita me pulsim"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Ekrani i kyçjes"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Kapërce ekranin e kyçjes"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6505370..b321e28 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -3482,6 +3482,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Прикажи на клизном панелу и закључаном екрану"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Прикажи на клизном панелу и статусној траци"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Прикажи на клизном панелу, статусној траци и закључаном екрану"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Укључи треперење лампице"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Закључан екран"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Прескакање закључаног екрана"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c1fa5cc..c7703e3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Visa på aviseringspanelen och låsskärmen."</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Visa på aviseringspanelen och i statusfältet."</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Visa på aviseringspanelen, i statusfältet och på låsskärmen."</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blinkande ljus"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Låsskärm"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Hoppa över låsskärmen"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 80bcf45..df34cf4 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Onyesha katika orodha kunjuzi na kwenye skrini iliyofungwa"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Onyesha katika orodha kunjuzi na kwenye sehemu ya arifa"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Onyesha katika orodha kunjuzi, sehemu ya arifa na kwenye skrini iliyofungwa"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Mwangaza umemeteke"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Skrini iliyofungwa"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Kuruka skrini iliyofungwa"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 7525909..99d8dc3 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"கீழ் இழுக்கும் ஷேட் &amp; பூட்டுத் திரையில் காட்டப்படும்"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"கீழ் இழுக்கும் ஷேட் &amp; நிலைப் பட்டியில் காட்டப்படும்"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"கீழ் இழுக்கும் ஷேட், நிலைப்பட்டி &amp; பூட்டுத் திரையில் காட்டப்படும்"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"ஒளியைச் சிமிட்டு"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"பூட்டுத் திரை"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"பூட்டுத் திரையைத் தவிர்த்தல்"</string>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index aa8cd43..7f5c05c 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -405,9 +405,17 @@
     <item msgid="2836895041823327816">"నీలి నేపథ్యంలో పసుపు రంగు"</item>
     <item msgid="747238414788976867">"అనుకూలం"</item>
   </string-array>
-    <!-- no translation found for vpn_types_long:6 (4631647675167100375) -->
-    <!-- no translation found for vpn_types_long:7 (8812228622975052811) -->
-    <!-- no translation found for vpn_types_long:8 (6630554779981113046) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6621806338070912611">"PPTP VPN"</item>
+    <item msgid="2552427673212085780">"పూర్వ-భాగస్వామ్య కీలతో L2TP/IPSec VPN"</item>
+    <item msgid="7378096704485168082">"ప్రమాణపత్రాలతో L2TP/IPSec VPN"</item>
+    <item msgid="3792393562235791509">"పూర్వ-భాగస్వామ్య కీలు మరియు Xauth ప్రామాణీకరణతో IPSec VPN"</item>
+    <item msgid="2484564813864139237">"ప్రమాణపత్రాలు మరియు Xauth ప్రామాణీకరణతో IPSec VPN"</item>
+    <item msgid="68918911194507915">"ప్రమాణపత్రాలు మరియు హైబ్రిడ్ ప్రామాణీకరణతో IPSec VPN"</item>
+    <item msgid="4631647675167100375">"సర్టిఫికెట్‌లు, యూజర్‌నేమ్/పాస్‌వర్డ్ ప్రామాణీకరణతో IKEv2/IPSec VPN"</item>
+    <item msgid="8812228622975052811">"\'ముందే షేర్ చేసిన కీ\'లతో IKEv2/IPSec VPN"</item>
+    <item msgid="6630554779981113046">"సర్టిఫికెట్‌లతో IKEv2/IPSec VPN"</item>
+  </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="7165538292837266997">"ఏదీ వద్దు"</item>
     <item msgid="2397017538263427575">"మాన్యువల్"</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 0fdb97d..2951d19 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"కిందకు-లాగే షేడ్ &amp; లాక్ స్క్రీన్‌లో ప్రదర్శిస్తుంది"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"కిందకు-లాగే షేడ్ &amp; స్థితి పట్టీ‌లో ప్రదర్శిస్తుంది"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"కిందకు-లాగే షేడ్, స్థితి పట్టీ &amp; లాక్ స్క్రీన్‌లో ప్రదర్శింపబడుతుంది"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"కాంతి మిణుకుమిణుకు అనేలా ఉంచు"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"లాక్ స్క్రీన్"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"లాక్ స్క్రీన్‌ను దాటవేయి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c638862..17f24e7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2997,12 +2997,12 @@
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"ต้องการนำผู้เข้าร่วมออกไหม"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"ระบบจะลบแอปและข้อมูลทั้งหมดในเซสชันนี้"</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"นำออก"</string>
-    <string name="user_enable_calling" msgid="264875360626905535">"เปิดโทรศัพท์"</string>
-    <string name="user_enable_calling_sms" msgid="8546430559552381324">"เปิดโทรศัพท์และ SMS"</string>
+    <string name="user_enable_calling" msgid="264875360626905535">"เปิดการโทร"</string>
+    <string name="user_enable_calling_sms" msgid="8546430559552381324">"เปิดการโทรและ SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"ลบผู้ใช้"</string>
-    <string name="user_enable_calling_confirm_title" msgid="7868894792723368364">"เปิดโทรศัพท์ไหม"</string>
+    <string name="user_enable_calling_confirm_title" msgid="7868894792723368364">"เปิดการโทรไหม"</string>
     <string name="user_enable_calling_confirm_message" msgid="4924965198409050155">"ระบบจะแชร์ประวัติการโทรกับผู้ใช้รายนี้"</string>
-    <string name="user_enable_calling_and_sms_confirm_title" msgid="4041510268838725520">"เปิดโทรศัพท์และ SMS ไหม"</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="4041510268838725520">"เปิดการโทรและ SMS ไหม"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="367792286597449922">"ระบบจะแชร์ประวัติการโทรและ SMS กับผู้ใช้รายนี้"</string>
     <string name="emergency_info_title" msgid="8233682750953695582">"ข้อมูลสำหรับกรณีฉุกเฉิน"</string>
     <string name="emergency_info_summary" msgid="8463622253016757697">"ข้อมูลและรายชื่อติดต่อสำหรับ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"แสดงในหน้าต่างแบบเลื่อนลงและในหน้าจอล็อก"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"แสดงในหน้าต่างแบบเลื่อนลงและแถบสถานะ"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"แสดงในหน้าต่างแบบเลื่อนลง แถบสถานะ และในหน้าจอล็อก"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"ไฟกะพริบ"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"หน้าจอล็อก"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ข้ามการล็อกหน้าจอ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2a2c8e9..65b4177 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Ipakita sa pull-down na shade at lock screen"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Ipakita sa pull-down na at status bar"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Ipakita sa pull-down na shade, status bar, at lock screen"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Patay-sinding ilaw"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Lock screen"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Laktawan ang lock screen"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 28160ff..0a4c334 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Aşağı açılır gölgede ve kilit ekranında gösterilir"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Aşağı açılır gölgede ve durum çubuğunda gösterilir"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Aşağı açılır gölgede, durum çubuğunda ve kilit ekranında gösterilir"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Işığı yakıp söndür"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Kilit ekranı"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Kilit ekranını atla"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8b1c642..7facdc7 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -3528,6 +3528,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Показувати на розкривній панелі й на заблокованому екрані"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Показувати на розкривній панелі й у рядку стану"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Показувати на розкривній панелі, у рядку стану й на заблокованому екрані"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Блимання"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Заблокований екран"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Пропускати заблокований екран"</string>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 15fdd59..943d8e1 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -405,9 +405,17 @@
     <item msgid="2836895041823327816">"نیلے پر پیلا"</item>
     <item msgid="747238414788976867">"حسب ضرورت"</item>
   </string-array>
-    <!-- no translation found for vpn_types_long:6 (4631647675167100375) -->
-    <!-- no translation found for vpn_types_long:7 (8812228622975052811) -->
-    <!-- no translation found for vpn_types_long:8 (6630554779981113046) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6621806338070912611">"PPTP VPN"</item>
+    <item msgid="2552427673212085780">"‏پہلے سے اشتراک کردہ کلیدوں کے ساتھ L2TP/IPSec VPN"</item>
+    <item msgid="7378096704485168082">"‏سرٹیفیکیٹس کے ساتھ L2TP/IPSec VPN"</item>
+    <item msgid="3792393562235791509">"‏پہلے سے اشتراک کردہ کلیدوں اور Xauth توثیق کے ساتھ IPSec VPN"</item>
+    <item msgid="2484564813864139237">"‏سرٹیفیکیٹس اور Xauth توثیق کے ساتھ IPSec VPN"</item>
+    <item msgid="68918911194507915">"‏سرٹیفیکیٹس اور ہائی برڈ توثیق کے ساتھ IPSec VPN"</item>
+    <item msgid="4631647675167100375">"‏سرٹیفیکیٹس اور صارف کا نام/ پاس ورڈ کی توثیق کے ساتھ IKEv2/IPSec VPN"</item>
+    <item msgid="8812228622975052811">"‏پہلے سے اشتراک کردہ کلیدوں کے ساتھ IKEv2/IPSec VPN"</item>
+    <item msgid="6630554779981113046">"‏سرٹیفیکیٹس کے ساتھ IKEv2/IPSec VPN"</item>
+  </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="7165538292837266997">"کوئی نہیں"</item>
     <item msgid="2397017538263427575">"دستی"</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 1084474..3dfe908 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -3434,6 +3434,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"نیچے کی طرف کھینچیں شیڈ اور مقفل اسکرین پر ڈسپلے کرتا ہے"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"نیچے کی طرف کھینچیں شیڈ اور اسٹیٹس بار پر ڈسپلے کرتا ہے"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"نیچے کی طرف کھینچیں شیڈ، اسٹیٹس بار اور مقفل اسکرین پر ڈسپلے کرتا ہے"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"بلنک لائٹ"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"مقفل اسکرین"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"مقفل اسکرین کو نظرانداز کرنے کیلئے"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 0387648..d36510e 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -3446,6 +3446,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Bildirishnomalar paneli va ekran qulfida chiqarish"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Bildirishnomalar paneli va holat qatorida chiqarish"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Bildirishnomalar paneli, holat qatori va ekran qulfida chiqarish"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Indikator"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Ekran qulfi"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ekran qulfini tashlab ketish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d5a941a..65a558d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Hiển thị trong ngăn kéo xuống và trên màn hình khóa"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Hiển thị trong ngăn kéo xuống và thanh trạng thái"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Hiển thị trong ngăn kéo xuống, thanh trạng thái và trên màn hình khóa"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Nhấp nháy đèn"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Màn hình khóa"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Bỏ qua màn hình khóa"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index eb0eb2b..cdccc0c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"显示在下拉通知栏和锁定屏幕中"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"显示在下拉通知栏和状态栏中"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"显示在下拉通知栏、状态栏以及锁定屏幕中"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"闪烁指示灯"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"锁定屏幕"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"跳过锁定屏幕"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 06e7dd9..08a5df0 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -3437,6 +3437,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"在下拉式面板和上鎖畫面中顯示"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"在下拉式面板和狀態列中顯示"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"在下拉式面板、狀態列和上鎖畫面中顯示"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"閃燈"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"上鎖畫面"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"略過上鎖畫面"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6f5bc9a..1e4e6ec 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -3436,6 +3436,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"顯示在下拉式通知欄和螢幕鎖定畫面中"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"顯示在下拉式通知欄和狀態列中"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"顯示在下拉式通知欄、狀態列和螢幕鎖定畫面中"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"閃爍燈光"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"螢幕鎖定"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"略過螢幕鎖定程序"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index bd9f5c3..b60495a 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -3437,6 +3437,8 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Iboniswa kumthunzi wokudonsela phansi nowokukhiywa kwesikrini"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Iboniswa kumthunzi wokudonselwa phansi nakubha yesimo"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Iboniswa kumthunzi wokudonselwa phansi, ibha yesimo nokukhiywa kwesikrini"</string>
+    <!-- no translation found for silent_notifications_status_bar (6113307620588767516) -->
+    <skip />
     <string name="notification_pulse_title" msgid="8013178454646671529">"Cwabizisa ukukhanya"</string>
     <string name="lock_screen_notifications_title" msgid="6215543388550190381">"Khiya isikrini"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Yeqa ukuze ukhiye isikrini"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 86be2cb..fc2ca1f 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -434,7 +434,4 @@
 
     <!-- Package name of dialer supports RTT setting-->
     <string name="config_rtt_setting_package_name" translatable="false"></string>
-
-    <!--Whether tether settings should be shown in one screen or not-->
-    <bool name="config_show_all_in_one_tether_settings">false</bool>
 </resources>
diff --git a/res/xml/all_tether_prefs.xml b/res/xml/all_tether_prefs.xml
index c541fe4..07e5d64 100644
--- a/res/xml/all_tether_prefs.xml
+++ b/res/xml/all_tether_prefs.xml
@@ -18,48 +18,50 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="tether_prefs_screen"
-    android:title="@string/tether_settings_title_all">
+    android:key="all_tether_prefs_screen"
+    android:title="@string/tether_settings_title_all"
+    settings:searchable="false">
 
     <PreferenceCategory
         android:key="wifi_tether_settings_group"
         android:title="@string/wifi_hotspot_checkbox_text"
         settings:searchable="false">
         <com.android.settings.wifi.tether.WifiTetherSsidPreference
-            android:key="wifi_tether_network_name"
+            android:key="wifi_tether_network_name_2"
             android:title="@string/wifi_hotspot_name_title"
             android:summary="@string/summary_placeholder"/>
 
         <com.android.settings.widget.ValidatedEditTextPreference
-            android:key="wifi_tether_network_password"
+            android:key="wifi_tether_network_password_2"
             android:persistent="false"
             android:title="@string/wifi_hotspot_password_title"/>
 
         <SwitchPreference
-            android:key="wifi_tether_auto_turn_off"
+            android:key="wifi_tether_auto_turn_off_2"
             android:title="@string/wifi_hotspot_auto_off_title"
             android:summary="@string/wifi_hotspot_auto_off_summary"/>
 
         <ListPreference
-            android:key="wifi_tether_security"
+            android:key="wifi_tether_security_2"
             android:title="@string/wifi_security"
             android:summary="@string/summary_placeholder"
             android:entries="@array/wifi_tether_security"
             android:entryValues="@array/wifi_tether_security_values"/>
 
         <ListPreference
-            android:key="wifi_tether_network_ap_band"
+            android:key="wifi_tether_network_ap_band_2"
             android:title="@string/wifi_hotspot_ap_band_title"/>
     </PreferenceCategory>
 
     <Preference
-        android:key="disabled_on_data_saver"
+        android:key="disabled_on_data_saver_2"
         android:summary="@string/tether_settings_disabled_on_data_saver"
         android:selectable="false"
+        settings:searchable="false"
         settings:allowDividerAbove="true" />
 
     <com.android.settingslib.widget.FooterPreference
-        android:key="tether_prefs_footer"
+        android:key="tether_prefs_footer_2"
         android:title="@string/tethering_footer_info"
         android:selectable="false"
         settings:searchable="false"/>
diff --git a/src/com/android/settings/AllInOneTetherSettings.java b/src/com/android/settings/AllInOneTetherSettings.java
index 1c7ea1d..098e6fb 100644
--- a/src/com/android/settings/AllInOneTetherSettings.java
+++ b/src/com/android/settings/AllInOneTetherSettings.java
@@ -36,12 +36,14 @@
 import android.os.Bundle;
 import android.os.UserManager;
 import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settings.datausage.DataSaverBackend;
 import com.android.settings.network.TetherEnabler;
@@ -72,19 +74,24 @@
         WifiTetherBasePreferenceController.OnTetherConfigUpdateListener,
         SharedPreferences.OnSharedPreferenceChangeListener {
 
-    @VisibleForTesting
-    static final String KEY_TETHER_PREFS_SCREEN = "tether_prefs_screen";
-    @VisibleForTesting
-    static final String KEY_WIFI_TETHER_NETWORK_NAME = "wifi_tether_network_name";
-    @VisibleForTesting
-    static final String KEY_WIFI_TETHER_NETWORK_PASSWORD = "wifi_tether_network_password";
-    @VisibleForTesting
-    static final String KEY_WIFI_TETHER_AUTO_OFF = "wifi_tether_auto_turn_off";
-    @VisibleForTesting
-    static final String KEY_WIFI_TETHER_NETWORK_AP_BAND = "wifi_tether_network_ap_band";
+    // TODO(b/148622133): Should clean up the postfix once this fragment replaced TetherSettings.
+    public static final String DEDUP_POSTFIX = "_2";
 
+    @VisibleForTesting
+    static final String KEY_WIFI_TETHER_NETWORK_NAME = "wifi_tether_network_name" + DEDUP_POSTFIX;
+    @VisibleForTesting
+    static final String KEY_WIFI_TETHER_NETWORK_PASSWORD =
+            "wifi_tether_network_password" + DEDUP_POSTFIX;
+    @VisibleForTesting
+    static final String KEY_WIFI_TETHER_AUTO_OFF = "wifi_tether_auto_turn_off" + DEDUP_POSTFIX;
+    @VisibleForTesting
+    static final String KEY_WIFI_TETHER_NETWORK_AP_BAND =
+            "wifi_tether_network_ap_band" + DEDUP_POSTFIX;
+    @VisibleForTesting
+    static final String KEY_WIFI_TETHER_SECURITY = "wifi_tether_security" + DEDUP_POSTFIX;
+
+    private static final String KEY_DATA_SAVER_FOOTER = "disabled_on_data_saver" + DEDUP_POSTFIX;
     private static final String KEY_WIFI_TETHER_GROUP = "wifi_tether_settings_group";
-    private static final String KEY_DATA_SAVER_FOOTER = "disabled_on_data_saver";
     private static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 2;
     private static final int EXPANDED_CHILD_COUNT_DEFAULT = 3;
     private static final String TAG = "AllInOneTetherSettings";
@@ -394,20 +401,18 @@
                     final List<String> keys = super.getNonIndexableKeys(context);
 
                     if (!TetherUtil.isTetherAvailable(context)) {
-                        keys.add(KEY_TETHER_PREFS_SCREEN);
                         keys.add(KEY_WIFI_TETHER_NETWORK_NAME);
                         keys.add(KEY_WIFI_TETHER_NETWORK_PASSWORD);
                         keys.add(KEY_WIFI_TETHER_AUTO_OFF);
                         keys.add(KEY_WIFI_TETHER_NETWORK_AP_BAND);
+                        keys.add(KEY_WIFI_TETHER_SECURITY);
                     }
-
                     return keys;
                 }
 
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
-                    return context.getResources().getBoolean(
-                            R.bool.config_show_all_in_one_tether_settings);
+                    return FeatureFlagUtils.isEnabled(context, FeatureFlags.TETHER_ALL_IN_ONE);
                 }
 
                 @Override
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index da86cbf..a29ec95 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -36,11 +36,13 @@
 import android.os.Handler;
 import android.os.UserManager;
 import android.provider.SearchIndexableResource;
+import android.util.FeatureFlagUtils;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
 
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.datausage.DataSaverBackend;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.wifi.tether.WifiTetherPreferenceController;
@@ -452,8 +454,7 @@
 
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
-                    return !context.getResources().getBoolean(
-                            R.bool.config_show_all_in_one_tether_settings);
+                    return !FeatureFlagUtils.isEnabled(context, FeatureFlags.TETHER_ALL_IN_ONE);
                 }
 
                 @Override
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index 3321c05..d2ad30d 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -28,4 +28,5 @@
             "settings_wifi_details_datausage_header";
     public static final String CONTROLLER_ENHANCEMENT = "settings_controller_loading_enhancement";
     public static final String CONDITIONAL_CARDS = "settings_conditionals";
+    public static final String TETHER_ALL_IN_ONE = "settings_tether_all_in_one";
 }
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index 5e52692..8fc05aa 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -33,13 +33,16 @@
 import android.os.Handler;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.util.FeatureFlagUtils;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.AllInOneTetherSettings;
 import com.android.settings.R;
 import com.android.settings.TetherSettings;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.TetherUtil;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -110,8 +113,8 @@
             // Grey out if provisioning is not available.
             mPreference.setEnabled(!TetherSettings.isProvisioningNeededButUnavailable(mContext));
 
-            if (mContext.getResources().getBoolean(R.bool.config_show_all_in_one_tether_settings)) {
-                mPreference.setFragment("com.android.settings.AllInOneTetherSettings");
+            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE)) {
+                mPreference.setFragment(AllInOneTetherSettings.class.getName());
             }
         }
     }
diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
index 8953fc2..3a571d7 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
@@ -16,9 +16,12 @@
 
 package com.android.settings.wifi.tether;
 
+import static com.android.settings.AllInOneTetherSettings.DEDUP_POSTFIX;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.net.wifi.SoftApConfiguration;
+import android.util.FeatureFlagUtils;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
@@ -26,6 +29,7 @@
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 
 public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferenceController {
 
@@ -87,7 +91,8 @@
 
     @Override
     public String getPreferenceKey() {
-        return PREF_KEY;
+        return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE)
+                ? PREF_KEY + DEDUP_POSTFIX : PREF_KEY;
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
index 1563e61..03ea121 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
@@ -16,14 +16,18 @@
 
 package com.android.settings.wifi.tether;
 
+import static com.android.settings.AllInOneTetherSettings.DEDUP_POSTFIX;
+
 import android.content.Context;
 import android.net.wifi.SoftApConfiguration;
 import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
 
 import androidx.preference.EditTextPreference;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.widget.ValidatedEditTextPreference;
 import com.android.settings.wifi.WifiUtils;
 
@@ -43,7 +47,8 @@
 
     @Override
     public String getPreferenceKey() {
-        return PREF_KEY;
+        return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE)
+                ? PREF_KEY + DEDUP_POSTFIX : PREF_KEY;
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
index 0283b0f..a4289a6 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
@@ -16,16 +16,20 @@
 
 package com.android.settings.wifi.tether;
 
+import static com.android.settings.AllInOneTetherSettings.DEDUP_POSTFIX;
+
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
 import android.net.wifi.SoftApConfiguration;
+import android.util.FeatureFlagUtils;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.EditTextPreference;
 import androidx.preference.Preference;
 
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.ValidatedEditTextPreference;
 import com.android.settings.wifi.dpp.WifiDppUtils;
@@ -54,7 +58,8 @@
 
     @Override
     public String getPreferenceKey() {
-        return PREF_KEY;
+        return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE)
+                ? PREF_KEY + DEDUP_POSTFIX : PREF_KEY;
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
index 9b9617a..56b5031 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
@@ -1,12 +1,16 @@
 package com.android.settings.wifi.tether;
 
+import static com.android.settings.AllInOneTetherSettings.DEDUP_POSTFIX;
+
 import android.content.Context;
 import android.net.wifi.SoftApConfiguration;
+import android.util.FeatureFlagUtils;
 
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 
 public class WifiTetherSecurityPreferenceController extends WifiTetherBasePreferenceController {
 
@@ -23,7 +27,8 @@
 
     @Override
     public String getPreferenceKey() {
-        return PREF_KEY;
+        return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE)
+                ? PREF_KEY + DEDUP_POSTFIX : PREF_KEY;
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index 4665515..66d017a 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -28,6 +28,7 @@
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.UserManager;
+import android.util.FeatureFlagUtils;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
@@ -35,6 +36,7 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.SwitchBar;
@@ -259,8 +261,7 @@
 
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
-                    return !context.getResources().getBoolean(
-                            R.bool.config_show_all_in_one_tether_settings);
+                    return !FeatureFlagUtils.isEnabled(context, FeatureFlags.TETHER_ALL_IN_ONE);
                 }
 
                 @Override
diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp
index 961acb2..1ba5d9c 100644
--- a/tests/perftests/Android.bp
+++ b/tests/perftests/Android.bp
@@ -1,5 +1,5 @@
 android_test {
-    name: "SettingsPrefTests",
+    name: "SettingsPerfTests",
 
     certificate: "platform",
 
diff --git a/tests/perftests/AndroidManifest.xml b/tests/perftests/AndroidManifest.xml
index 902090a..4ce6a54 100644
--- a/tests/perftests/AndroidManifest.xml
+++ b/tests/perftests/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.tests.pref">
+    package="com.android.settings.tests.perf">
 
     <application>
         <uses-library android:name="android.test.runner" />
diff --git a/tests/perftests/src/com/android/settings/tests/pref/LaunchSettingsTest.java b/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
similarity index 97%
rename from tests/perftests/src/com/android/settings/tests/pref/LaunchSettingsTest.java
rename to tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
index 9e035cd..5140be2 100644
--- a/tests/perftests/src/com/android/settings/tests/pref/LaunchSettingsTest.java
+++ b/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.tests.pref;
+package com.android.settings.tests.perf;
 
 import android.app.Instrumentation;
 import android.os.Bundle;
diff --git a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
index 37a3474..61db0e5 100644
--- a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
@@ -26,7 +26,9 @@
 import android.net.ConnectivityManager;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.util.FeatureFlagUtils;
 
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.testutils.shadow.ShadowWifiManager;
 import com.android.settings.wifi.tether.WifiTetherAutoOffPreferenceController;
 
@@ -69,21 +71,27 @@
     }
 
     @Test
-    public void getNonIndexableKeys_tetherAvailable_keysReturned() {
+    public void getNonIndexableKeys_tetherAvailable_keysNotReturned() {
         // To let TetherUtil.isTetherAvailable return true, select one of the combinations
         setupIsTetherAvailable(true);
 
         final List<String> niks =
                 AllInOneTetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
 
-        // TODO(b/147675042) Should revert these assertions, after switching to new UI.
-        // Because of the config check, we are not indexing these keys. Once we enable the config
-        // these assert would also need to change.
-        assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_NAME);
-        assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_PASSWORD);
-        assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_AUTO_OFF);
-        assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_AP_BAND);
-        assertThat(niks).contains(AllInOneTetherSettings.KEY_TETHER_PREFS_SCREEN);
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE)) {
+            assertThat(niks).doesNotContain(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_NAME);
+            assertThat(niks).doesNotContain(
+                    AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_PASSWORD);
+            assertThat(niks).doesNotContain(AllInOneTetherSettings.KEY_WIFI_TETHER_AUTO_OFF);
+            assertThat(niks).doesNotContain(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_AP_BAND);
+            assertThat(niks).doesNotContain(AllInOneTetherSettings.KEY_WIFI_TETHER_SECURITY);
+        } else {
+            assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_NAME);
+            assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_PASSWORD);
+            assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_AUTO_OFF);
+            assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_AP_BAND);
+            assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_SECURITY);
+        }
     }
 
     @Test
@@ -98,7 +106,7 @@
         assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_PASSWORD);
         assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_AUTO_OFF);
         assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_NETWORK_AP_BAND);
-        assertThat(niks).contains(AllInOneTetherSettings.KEY_TETHER_PREFS_SCREEN);
+        assertThat(niks).contains(AllInOneTetherSettings.KEY_WIFI_TETHER_SECURITY);
     }
 
     @Test