Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda
Change-Id: Ibc06bd838df06258f98e87fcb3a9da43c47be504
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 4218a24..60f7832 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -288,7 +288,7 @@
<item msgid="7621394050624063528">"موقع وهمي"</item>
<item msgid="37519917674959757">"قراءة مساحة التخزين"</item>
<item msgid="3868809525697401379">"كتابة مساحة التخزين"</item>
- <item msgid="2504191192460059817">"تفعيل الشاشة"</item>
+ <item msgid="2504191192460059817">"تشغيل الشاشة"</item>
<item msgid="7905819538788103556">"الحصول على الحسابات"</item>
<item msgid="1675025662248079254">"التشغيل في الخلفية"</item>
<item msgid="2553974920157061225">"مستوى صوت \"سهولة الاستخدام\""</item>
@@ -355,7 +355,7 @@
<item msgid="2363460595607829243">"موقع وهمي"</item>
<item msgid="3778165903878569143">"قراءة مساحة التخزين"</item>
<item msgid="555939881912035315">"كتابة مساحة التخزين"</item>
- <item msgid="4281352581602735717">"تفعيل الشاشة"</item>
+ <item msgid="4281352581602735717">"تشغيل الشاشة"</item>
<item msgid="346122795998225472">"الحصول على الحسابات"</item>
<item msgid="3756073389408535680">"التشغيل في الخلفية"</item>
<item msgid="2114661179947426734">"مستوى صوت \"سهولة الاستخدام\""</item>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 1a73dd6..2a657b8 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -330,7 +330,7 @@
<item msgid="745291221457314879">"Master həcmi"</item>
<item msgid="4722479281326245754">"Səs həcmi"</item>
<item msgid="6749550886745567276">"Zəng həcmi"</item>
- <item msgid="2218685029915863168">"Media səsi"</item>
+ <item msgid="2218685029915863168">"Media həcmi"</item>
<item msgid="4266577290496513640">"Siqnal səsi"</item>
<item msgid="8608084169623998854">"Bildiriş həcmi"</item>
<item msgid="7948784184567841794">"Bluetooth həcmi"</item>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 0e22b48..30d93d9 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -100,8 +100,8 @@
<!-- no translation found for wifi_tether_security:1 (1428294025896439258) -->
<string-array name="eap_ocsp_type">
<item msgid="7202884222741437608">"Не правяраць"</item>
- <item msgid="5703177653586269306">"Запыт стану сертыфіката"</item>
- <item msgid="326388247868439528">"Патрэбны стан сертыфіката"</item>
+ <item msgid="5703177653586269306">"Запыт стану сертыфікату"</item>
+ <item msgid="326388247868439528">"Патрэбны стан сертыфікату"</item>
<item msgid="1090956283885790552">"Патрабуюцца станы ўсіх недавераных сертыфікатаў"</item>
</string-array>
<string-array name="wifi_p2p_wps_setup">
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 55129ba..3a47515 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2127,8 +2127,7 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tap a button to zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="2023126829553044999">"Quickly zoom in on the screen to display content more clearly.<br/><br/> <b>To zoom in:</b><br/> 1. Use shortcut to start magnification<br/> 2. Tap the screen<br/> 3. Drag two fingers to move around screen<br/> 4. Pinch with two fingers to adjust zoom<br/> 5. Use shortcut to stop magnification<br/><br/> <b>To zoom in temporarily:</b><br/> 1. Use shortcut to start magnification<br/> 2. Touch and hold anywhere on the screen<br/> 3. Drag finger to move around screen<br/> 4. Lift finger to stop magnification"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
- <!-- no translation found for accessibility_tutorial_pager (8461939455728454061) -->
- <skip />
+ <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use accessibility button to open"</string>
<string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"Hold volume keys to open"</string>
<string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"Triple-tap screen to open"</string>
@@ -3529,18 +3528,18 @@
<string name="notification_importance_blocked" msgid="4933285639639899394">"Never show notifications"</string>
<string name="conversations_category_title" msgid="5586541340846847798">"Conversations"</string>
<string name="conversation_category_title" msgid="6777135786004214149">"Conversation"</string>
- <!-- no translation found for conversation_section_switch_title (3332885377659473775) -->
- <skip />
- <!-- no translation found for conversation_section_switch_summary (2513479452656556753) -->
- <skip />
+ <string name="conversation_section_switch_title" msgid="3332885377659473775">"Conversation section"</string>
+ <string name="conversation_section_switch_summary" msgid="2513479452656556753">"Allow <xliff:g id="APP">%1$s</xliff:g> to appear in the conversation section"</string>
<string name="demote_conversation_title" msgid="6355383023376508485">"Not a conversation"</string>
<string name="demote_conversation_summary" msgid="4319929331165604112">"Remove from the conversation section"</string>
<string name="promote_conversation_title" msgid="4731148769888238722">"This is a conversation"</string>
<string name="promote_conversation_summary" msgid="3890724115743515035">"Add to the conversation section"</string>
<string name="manage_conversations" msgid="4440289604887824337">"Manage conversations"</string>
- <!-- no translation found for priority_conversation_count_zero (3862289535537564713) -->
- <skip />
- <!-- no translation found for priority_conversation_count (4229447176780862649) -->
+ <string name="priority_conversation_count_zero" msgid="3862289535537564713">"No priority conversations"</string>
+ <plurals name="priority_conversation_count" formatted="false" msgid="4229447176780862649">
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> priority conversations</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> priority conversation</item>
+ </plurals>
<string name="important_conversations" msgid="1233893707189659401">"Priority conversations"</string>
<string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Show at top of conversation section and appear as floating bubbles"</string>
<string name="important_conversations_summary" msgid="3184022761562676418">"Show at top of conversation section"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index f7f34c3..741972d 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -2127,8 +2127,7 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tap a button to zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="2023126829553044999">"Quickly zoom in on the screen to display content more clearly.<br/><br/> <b>To zoom in:</b><br/> 1. Use shortcut to start magnification<br/> 2. Tap the screen<br/> 3. Drag two fingers to move around screen<br/> 4. Pinch with two fingers to adjust zoom<br/> 5. Use shortcut to stop magnification<br/><br/> <b>To zoom in temporarily:</b><br/> 1. Use shortcut to start magnification<br/> 2. Touch and hold anywhere on the screen<br/> 3. Drag finger to move around screen<br/> 4. Lift finger to stop magnification"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
- <!-- no translation found for accessibility_tutorial_pager (8461939455728454061) -->
- <skip />
+ <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use accessibility button to open"</string>
<string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"Hold volume keys to open"</string>
<string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"Triple-tap screen to open"</string>
@@ -3529,18 +3528,18 @@
<string name="notification_importance_blocked" msgid="4933285639639899394">"Never show notifications"</string>
<string name="conversations_category_title" msgid="5586541340846847798">"Conversations"</string>
<string name="conversation_category_title" msgid="6777135786004214149">"Conversation"</string>
- <!-- no translation found for conversation_section_switch_title (3332885377659473775) -->
- <skip />
- <!-- no translation found for conversation_section_switch_summary (2513479452656556753) -->
- <skip />
+ <string name="conversation_section_switch_title" msgid="3332885377659473775">"Conversation section"</string>
+ <string name="conversation_section_switch_summary" msgid="2513479452656556753">"Allow <xliff:g id="APP">%1$s</xliff:g> to appear in the conversation section"</string>
<string name="demote_conversation_title" msgid="6355383023376508485">"Not a conversation"</string>
<string name="demote_conversation_summary" msgid="4319929331165604112">"Remove from the conversation section"</string>
<string name="promote_conversation_title" msgid="4731148769888238722">"This is a conversation"</string>
<string name="promote_conversation_summary" msgid="3890724115743515035">"Add to the conversation section"</string>
<string name="manage_conversations" msgid="4440289604887824337">"Manage conversations"</string>
- <!-- no translation found for priority_conversation_count_zero (3862289535537564713) -->
- <skip />
- <!-- no translation found for priority_conversation_count (4229447176780862649) -->
+ <string name="priority_conversation_count_zero" msgid="3862289535537564713">"No priority conversations"</string>
+ <plurals name="priority_conversation_count" formatted="false" msgid="4229447176780862649">
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> priority conversations</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> priority conversation</item>
+ </plurals>
<string name="important_conversations" msgid="1233893707189659401">"Priority conversations"</string>
<string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Show at top of conversation section and appear as floating bubbles"</string>
<string name="important_conversations_summary" msgid="3184022761562676418">"Show at top of conversation section"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index d2760b3f..9776827 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -2019,8 +2019,7 @@
<string name="spellchecker_language" msgid="8905487366580285282">"Language"</string>
<string name="keyboard_and_input_methods_category" msgid="5296847777802891649">"Keyboards"</string>
<string name="virtual_keyboard_category" msgid="2339505603075527212">"On-screen keyboard"</string>
- <!-- no translation found for available_virtual_keyboard_category (6930012948152749337) -->
- <skip />
+ <string name="available_virtual_keyboard_category" msgid="6930012948152749337">"Available On-screen keyboard"</string>
<string name="add_virtual_keyboard" msgid="2515850206289352606">"Manage on-screen keyboards"</string>
<string name="keyboard_assistance_category" msgid="7320599809770932032">"Keyboard assistance"</string>
<string name="physical_keyboard_title" msgid="3328134097512350958">"Physical keyboard"</string>
@@ -2029,8 +2028,7 @@
<string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Keyboard shortcuts"</string>
<string name="keyboard_shortcuts_helper_summary" msgid="8649760728213630156">"Display available shortcuts"</string>
<string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Work profile keyboards & tools"</string>
- <!-- no translation found for virtual_keyboards_for_work_title (786459157034008675) -->
- <skip />
+ <string name="virtual_keyboards_for_work_title" msgid="786459157034008675">"On-screen keyboard for work"</string>
<string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Pointer speed"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Game Controller"</string>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 70688e9..cc6ea49 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -102,7 +102,7 @@
<item msgid="7202884222741437608">"Ne pas valider"</item>
<item msgid="5703177653586269306">"Demander l\'état du certificat"</item>
<item msgid="326388247868439528">"Exiger l\'état du certificat"</item>
- <item msgid="1090956283885790552">"Exiger tous les états de certificats non fiables"</item>
+ <item msgid="1090956283885790552">"Exiger tous les états de certificat non fiable"</item>
</string-array>
<string-array name="wifi_p2p_wps_setup">
<item msgid="1446717102923442720">"Bouton de commande"</item>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index f019fd5..d326195 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -366,7 +366,7 @@
<item msgid="6740026006576843477">"લાંબો"</item>
</string-array>
<string-array name="captioning_typeface_selector_titles">
- <item msgid="2166553138528640250">"ડિફૉલ્ટ"</item>
+ <item msgid="2166553138528640250">"ડિફોલ્ટ"</item>
<item msgid="4234707448428002595">"Sans-serif"</item>
<item msgid="2390008695651897663">"Sans-serif condensed"</item>
<item msgid="2396492419730702454">"Sans-serif monospace"</item>
@@ -391,7 +391,7 @@
<item msgid="6838252010935384975">"ખૂબ મોટું ટેક્સ્ટ કદ"</item>
</string-array>
<string-array name="captioning_edge_type_selector_titles">
- <item msgid="70686029249840227">"ડિફૉલ્ટ"</item>
+ <item msgid="70686029249840227">"ડિફોલ્ટ"</item>
<item msgid="4224714345662348668">"કોઈ નહીં"</item>
<item msgid="4132127611510627490">"બાહ્યરેખા"</item>
<item msgid="1226216870460161087">"છાયો છોડો"</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 971bb4d..d78f95f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -2142,7 +2142,7 @@
<string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"Para usar um recurso de acessibilidade, deslize de baixo para cima na tela com dois dedos.\n\nPara alternar entre recursos, deslize de baixo para cima com dois dedos, sem soltar."</string>
<string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"Para usar um recurso de acessibilidade, deslize de baixo para cima na tela com três dedos.\n\nPara alternar entre recursos, deslize de baixo para cima com três dedos, sem soltar."</string>
<string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"Ok"</string>
- <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Atalho para <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
+ <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Atalho para o <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
<string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"Botão de acessibilidade"</string>
<string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Deslizar para cima com dois dedos"</string>
<string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"Deslizar para cima com três dedos"</string>
@@ -2267,8 +2267,8 @@
<string name="accessibility_vibration_intensity_medium" msgid="1734058611879392797">"Média"</string>
<string name="accessibility_vibration_intensity_high" msgid="5982896399775212514">"Alta"</string>
<string name="accessibility_menu_item_settings" msgid="2652637954865389271">"Configurações"</string>
- <string name="accessibility_feature_state_on" msgid="1777344331063467511">"Ativado"</string>
- <string name="accessibility_feature_state_off" msgid="169119895905460512">"Desativado"</string>
+ <string name="accessibility_feature_state_on" msgid="1777344331063467511">"Ativadas"</string>
+ <string name="accessibility_feature_state_off" msgid="169119895905460512">"Desativada"</string>
<string name="captioning_preview_title" msgid="2888561631323180535">"Visualização"</string>
<string name="captioning_standard_options_title" msgid="5360264497750980205">"Opções padrão"</string>
<string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 7b0af94..8c2b21e 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -264,7 +264,7 @@
<item msgid="1249691739381713634">"ovoz balandligi"</item>
<item msgid="6485000384018554920">"jiringlash tovushi"</item>
<item msgid="3378000878531336372">"multimedia tovushi"</item>
- <item msgid="5272927168355895681">"Signal tovushi"</item>
+ <item msgid="5272927168355895681">"Signal balandligi"</item>
<item msgid="4422070755065530548">"xabarnoma tovush balandligi"</item>
<item msgid="3250654589277825306">"bluetooth tovush balandligi"</item>
<item msgid="4212187233638382465">"uyg‘oq turish"</item>
@@ -331,7 +331,7 @@
<item msgid="4722479281326245754">"Ovoz balandligi"</item>
<item msgid="6749550886745567276">"Jiringlash tovushi"</item>
<item msgid="2218685029915863168">"Multimedia tovushi"</item>
- <item msgid="4266577290496513640">"Signal tovushi"</item>
+ <item msgid="4266577290496513640">"Signal balandligi"</item>
<item msgid="8608084169623998854">"Xabarnoma tovush balandligi"</item>
<item msgid="7948784184567841794">"Bluetooth tovush balandligi"</item>
<item msgid="1148968792599973150">"Uyg‘oq turish"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index a8c2f03..7252169 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -2127,8 +2127,7 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Kattalashtirish uchun tugmani bosing"</string>
<string name="accessibility_screen_magnification_summary" msgid="2023126829553044999">"Ekrandagi kontentni tiniqlashtirish uchun uni tezkor usulda kattalashtiring.<br/><br/> <b>Kattalashtirish uchun:</b><br/> 1. Kattalashtirish tugmasini bosing<br/> 2. Ekran ustiga bosing<br/> 3. Ekranni 2 ta barmoq bilan suring<br/> 4. Moslash uchun 2 ta barmoq bilan chimding<br/> 5. Yakunlash uchun kattalashtirish tugmasini bosing<br/><br/> <b>Vaqtincha kattalashtirish uchun:</b><br/> 1. Kattalashtirish tugmasini bosing<br/> 2. Ekranning istalgan qismini bosib turing<br/> 3. Ekranni barmoq bilan suring<br/> 4. Yakunlash uchun barmoqni ekrandan oling"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Agar kattalashtirish yoqilsa, ekrandagi maʼlumotlarni kattalashtirish mumkin.\n\n"<b>"Kattalashtirish"</b>" uchun zum tugmasini bosib, ekranning istalgan joyini bosing.\n"<ul><li>"Siljitish uchun bir nechta barmogʻingiz bilan suring"</li>\n<li>"Masshtabini oʻzgartirish uchun bir nechta barmogʻingizni jipslashtiring"</li></ul>\n\n<b>"Vaqtinchalik kattalashtirish uchun"</b>" zum tugmasini bosib, ekranning istalgan joyini bosing va ushlab turing.\n"<ul><li>"Ekran boʻylab harakatlanish uchun suring"</li>\n<li>"Oʻz holatiga qaytarish uchun barmoqni qoʻyib yuboring"</li></ul>\n\n"Klaviatura yoki navigatsiya paneli orqali kattalashtirib boʻlmaydi."</string>
- <!-- no translation found for accessibility_tutorial_pager (8461939455728454061) -->
- <skip />
+ <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Sahifa: <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Maxsus imkoniyatlar tugmasi bilan oching"</string>
<string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"Ochish uchun ikkala tovush tugmasini bosib turing."</string>
<string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"Ochish uchun ekranga uch marta bosing"</string>
@@ -3537,18 +3536,18 @@
<string name="notification_importance_blocked" msgid="4933285639639899394">"Bildirishnomalar hech qachon ko‘rsatilmasin"</string>
<string name="conversations_category_title" msgid="5586541340846847798">"Suhbatlar"</string>
<string name="conversation_category_title" msgid="6777135786004214149">"Suhbat"</string>
- <!-- no translation found for conversation_section_switch_title (3332885377659473775) -->
- <skip />
- <!-- no translation found for conversation_section_switch_summary (2513479452656556753) -->
- <skip />
+ <string name="conversation_section_switch_title" msgid="3332885377659473775">"Suhbat qismi"</string>
+ <string name="conversation_section_switch_summary" msgid="2513479452656556753">"<xliff:g id="APP">%1$s</xliff:g> ilovasiga suhbat qismida chiqishga ruxsat berish"</string>
<string name="demote_conversation_title" msgid="6355383023376508485">"Suhbat emas"</string>
<string name="demote_conversation_summary" msgid="4319929331165604112">"Suhbatlar ruknidan olib tashlash"</string>
<string name="promote_conversation_title" msgid="4731148769888238722">"Bu – suhbat"</string>
<string name="promote_conversation_summary" msgid="3890724115743515035">"Suhbat boʻlimiga kiritish"</string>
<string name="manage_conversations" msgid="4440289604887824337">"Suhbatlarni boshqarish"</string>
- <!-- no translation found for priority_conversation_count_zero (3862289535537564713) -->
- <skip />
- <!-- no translation found for priority_conversation_count (4229447176780862649) -->
+ <string name="priority_conversation_count_zero" msgid="3862289535537564713">"Hech qanday muhim suhbatlar mavjud emas"</string>
+ <plurals name="priority_conversation_count" formatted="false" msgid="4229447176780862649">
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ta muhim suhbat</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta muhim suhbat</item>
+ </plurals>
<string name="important_conversations" msgid="1233893707189659401">"Muhim suhbatlar"</string>
<string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Suhbatlar ruknining tepasida erkin bulutcha sifatida chiqarish"</string>
<string name="important_conversations_summary" msgid="3184022761562676418">"Suhbatlar ruknining tepasida chiqarish"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index ced3b5a..767ca83 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -264,7 +264,7 @@
<item msgid="1249691739381713634">"âm lượng thoại"</item>
<item msgid="6485000384018554920">"âm lượng chuông"</item>
<item msgid="3378000878531336372">"âm lượng nội dung nghe nhìn"</item>
- <item msgid="5272927168355895681">"âm lượng chuông báo"</item>
+ <item msgid="5272927168355895681">"âm lượng báo thức"</item>
<item msgid="4422070755065530548">"âm lượng thông báo"</item>
<item msgid="3250654589277825306">"âm lượng bluetooth"</item>
<item msgid="4212187233638382465">"không khóa màn hình"</item>
@@ -331,7 +331,7 @@
<item msgid="4722479281326245754">"Âm lượng thoại"</item>
<item msgid="6749550886745567276">"Âm lượng chuông"</item>
<item msgid="2218685029915863168">"Âm lượng nội dung nghe nhìn"</item>
- <item msgid="4266577290496513640">"Âm lượng chuông báo"</item>
+ <item msgid="4266577290496513640">"Âm lượng báo thức"</item>
<item msgid="8608084169623998854">"Âm lượng thông báo"</item>
<item msgid="7948784184567841794">"Âm lượng bluetooth"</item>
<item msgid="1148968792599973150">"Không khóa màn hình"</item>
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 9e7f3ed..b088fe3 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -76,6 +76,7 @@
private RingtonePreference mRequestPreference;
private UpdatableListPreferenceDialogFragment mDialogFragment;
private String mHfpOutputControllerKey;
+ private String mVibrationPreferencesKey = "vibration_preference_screen";
@Override
public int getMetricsCategory() {
@@ -127,6 +128,10 @@
@Override
public void onDisplayPreferenceDialog(Preference preference) {
+ if (TextUtils.equals(mVibrationPreferencesKey, preference.getKey())) {
+ super.onDisplayPreferenceDialog(preference);
+ return;
+ }
final int metricsCategory;
if (mHfpOutputControllerKey.equals(preference.getKey())) {
metricsCategory = SettingsEnums.DIALOG_SWITCH_HFP_DEVICES;
@@ -310,4 +315,4 @@
mDialogFragment.onListPreferenceUpdated(preference);
}
}
-}
\ No newline at end of file
+}