Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 06f7203..3356340 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -3639,7 +3639,7 @@
<string name="keywords_profile_challenge" msgid="5135555521652143612">"የስራ ፈተና፣ ስራ፣ መገለጫ"</string>
<string name="keywords_unification" msgid="2677472004971453468">"የሥራ መገለጫ፣ የሚተዳደር መገለጫ፣ አዋህድ፣ ውህደት፣ ሥራ፣ መገለጫ"</string>
<string name="keywords_gesture" msgid="3456930847450080520">"የጣት ምልክቶች"</string>
- <string name="keywords_wallet" msgid="3757421969956996972">"የኪስ ቦርሳ"</string>
+ <string name="keywords_wallet" msgid="3757421969956996972">"Wallet"</string>
<string name="keywords_payment_settings" msgid="6268791289277000043">"ይክፈሉ፣ መታ ያድርጉ፣ ክፍያዎች"</string>
<string name="keywords_backup" msgid="707735920706667685">"ምትኬ"</string>
<string name="keywords_assist_gesture_launch" msgid="7710762655355161924">"የጣት ምልክት"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 46f39a5..a2de168 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -2304,7 +2304,7 @@
<string name="talkback_title" msgid="8756080454514251327">"Talkback"</string>
<string name="talkback_summary" msgid="5820927220378864281">"صفحه‌خوان در وهله اول برای افراد نابینا و کم‌بینا در نظر گرفته شده است"</string>
<string name="select_to_speak_summary" msgid="1995285446766920925">"روی موارد موجود در صفحه‌تان ضربه بزنید تا بلند خوانده شوند"</string>
- <string name="accessibility_captioning_title" msgid="4561871958958925225">"اولویت‌های زیرنویس"</string>
+ <string name="accessibility_captioning_title" msgid="4561871958958925225">"اولویت‌های زیرنویس ناشنوایان"</string>
<string name="accessibility_captioning_about_title" msgid="3542171637334191563">"درباره اولویت‌های زیرنویس ناشنوایان"</string>
<string name="accessibility_captioning_footer_learn_more_content_description" msgid="5730040700677017706">"درباره اولویت‌های زیرنویس ناشنوایان بیشتر بدانید"</string>
<string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"بزرگ‌نمایی"</string>
@@ -2508,7 +2508,7 @@
<string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"کلیدهای میزان صدا را نگه‌دارید"</string>
<string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"سه ضربه روی صفحه بزنید"</string>
<string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"ادامه"</string>
- <string name="accessibility_hearingaid_title" msgid="427173678199203191">"سمعک‌ها"</string>
+ <string name="accessibility_hearingaid_title" msgid="427173678199203191">"سمعک"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="3371427366765435743">"هیچ سمعکی متصل نشده است"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"افزودن سمعک‌ها"</string>
<string name="accessibility_hearingaid_pair_instructions_title" msgid="2357706801112207624">"مرتبط کردن سمعک"</string>
@@ -4915,7 +4915,7 @@
<string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"باز کردن سریع دوربین"</string>
<string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"برای باز کردن سریع دوربین، دکمه روشن/خاموش را دو بار فشار دهید. در همه صفحه‌ها کار می‌کند."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="4299496243418753571">"باز کردن سریع دوربین"</string>
- <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"خودگرفت با چرخش دوربین"</string>
+ <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"خودگرفت با چرخاندن دوربین"</string>
<string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="8178844037382604158">"سریع‌تر گرفتن خودگرفت"</string>
<string name="system_navigation_title" msgid="1698862900901417194">"پیمایش سیستمی"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9887605..b81b5d1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1411,11 +1411,11 @@
<string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"S\'active à l\'heure choisie"</string>
<string name="dark_ui_auto_mode_custom_bedtime" msgid="8465023741946439266">"S\'active à l\'heure du coucher"</string>
<string name="dark_ui_status_title" msgid="3505119141437774329">"État"</string>
- <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ne s\'active jamais automatiquement"</string>
+ <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ne s\'activera jamais automatiquement"</string>
<string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"S\'active automatiquement au coucher du soleil"</string>
<string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"S\'active automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="dark_ui_summary_off_auto_mode_custom_bedtime" msgid="7759826673214624622">"S\'active automatiquement à l\'heure du coucher"</string>
- <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ne jamais désactiver automatiquement"</string>
+ <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ne se désactivera jamais automatiquement"</string>
<string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Désactiver automatiquement au lever du soleil"</string>
<string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Désactiver automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="dark_ui_summary_on_auto_mode_custom_bedtime" msgid="1976993025762551246">"Se désactive automatiquement après l\'heure du coucher"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index adbc49a..61bac51 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -4204,7 +4204,7 @@
<string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"എല്ലാ കോളുകളും നിങ്ങൾക്ക് ലഭിക്കും"</string>
<string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ഒന്നുമില്ല}=1{ഒരു കോൺടാക്റ്റ്}other{# കോൺടാക്റ്റുകൾ}}"</string>
<string name="zen_mode_from_anyone" msgid="6027004263046694174">"ആർക്കും വിളിക്കാം"</string>
- <string name="zen_mode_from_contacts" msgid="2989933306317064818">"കോൺടാക്റ്റുകൾ"</string>
+ <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
<string name="zen_mode_from_starred" msgid="8616516644241652287">"നക്ഷത്രചിഹ്നമിട്ടവ"</string>
<string name="zen_mode_from_some" msgid="3708450042225044524">"ചില ആളുകളോ സംഭാഷണങ്ങളോ"</string>
<string name="zen_calls_summary_starred_repeat" msgid="8078759939219244001">"നക്ഷത്രമിട്ടിട്ടുള്ള കോൺടാക്റ്റുകളിൽ നിന്നും ആവർത്തിച്ച് വിളിക്കുന്നവരിൽ നിന്നും"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 34e2a80..bdc1993 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -4853,7 +4853,7 @@
<string name="display_cutout_emulation_keywords" msgid="4506580703807358127">"corte de tela, entalhe"</string>
<string name="overlay_option_device_default" msgid="7986355499809313848">"Padrão do dispositivo"</string>
<string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"Falha ao aplicar sobreposição"</string>
- <string name="special_access" msgid="1767980727423395147">"Acesso especial a apps"</string>
+ <string name="special_access" msgid="1767980727423395147">"Acesso especial para apps"</string>
<plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados ilimitados</item>
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem usar dados ilimitados</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 34e2a80..bdc1993 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -4853,7 +4853,7 @@
<string name="display_cutout_emulation_keywords" msgid="4506580703807358127">"corte de tela, entalhe"</string>
<string name="overlay_option_device_default" msgid="7986355499809313848">"Padrão do dispositivo"</string>
<string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"Falha ao aplicar sobreposição"</string>
- <string name="special_access" msgid="1767980727423395147">"Acesso especial a apps"</string>
+ <string name="special_access" msgid="1767980727423395147">"Acesso especial para apps"</string>
<plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados ilimitados</item>
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem usar dados ilimitados</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 44d82dc..8b484a0 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1472,7 +1472,7 @@
<string name="wallpaper_dashboard_summary" msgid="2324472863981057118">"Главный экран, заблокированный экран"</string>
<string name="wallpaper_settings_summary_default" msgid="7569803705735001813">"По умолчанию"</string>
<string name="wallpaper_settings_summary_custom" msgid="3174561317688848729">"Пользовательские"</string>
- <string name="wallpaper_suggestion_title" msgid="3812842717939877330">"Сменить обои"</string>
+ <string name="wallpaper_suggestion_title" msgid="3812842717939877330">"Обои"</string>
<string name="wallpaper_suggestion_summary" msgid="9077061486716754784">"Выберите обои для экрана"</string>
<string name="wallpaper_settings_fragment_title" msgid="8445963841717633149">"Установка обоев"</string>
<string name="style_suggestion_title" msgid="1213747484782364775">"Настройка телефона"</string>
@@ -2385,7 +2385,7 @@
<string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Увеличение с помощью кнопки и по тройному нажатию"</string>
<string name="accessibility_introduction_title" msgid="8834950581512452348">"О функции \"<xliff:g id="SERVICE">%1$s</xliff:g>\""</string>
<string name="accessibility_text_reading_options_title" msgid="3224648909213325563">"Масштаб экрана и текст"</string>
- <string name="accessibility_text_reading_options_suggestion_title" msgid="2492155642665312733">"Настройки отображения текста"</string>
+ <string name="accessibility_text_reading_options_suggestion_title" msgid="2492155642665312733">"Отображение текста"</string>
<string name="accessibility_text_reading_preview_mail_subject" msgid="4597374768612733616">"Тема: Дизайн воздушного шара"</string>
<string name="accessibility_text_reading_preview_mail_from" msgid="1797499780365288020">"От: Борис"</string>
<string name="accessibility_text_reading_preview_mail_content" msgid="8078152365771951802">"Доброе утро!\n\nКак дела с дизайном? Он будет готов до того, как мы начнем разработку новых шаров?"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a540e2f..d665c7e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -5389,7 +5389,7 @@
<string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Povoliť aplikácii ovládať Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Toto povolenie umožňuje tejto aplikácii zapínať a vypínať Wi-Fi, hľadať siete Wi-Fi a pripájať sa k nim, pridávať a odstraňovať siete alebo vytvárať miestny hotspot"</string>
<string name="media_output_title" msgid="8283629315159510680">"Prehrať média v zariadení"</string>
- <string name="media_output_label_title" msgid="4139048973886819148">"Prehrať <xliff:g id="LABEL">%s</xliff:g> cez"</string>
+ <string name="media_output_label_title" msgid="4139048973886819148">"Pustiť <xliff:g id="LABEL">%s</xliff:g> cez"</string>
<string name="media_output_default_summary" msgid="4200343059396412376">"Toto zariadenie"</string>
<string name="media_output_summary" product="default" msgid="4760338801715262899">"Telefón"</string>
<string name="media_output_summary" product="tablet" msgid="5138101426462250247">"Tablet"</string>
diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
index 60faab9..7003eed 100644
--- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
@@ -180,10 +180,11 @@
| AuthenticatorException e) {
// handled below
Log.w(TAG, "Remove account error: " + e);
- RemoveAccountFailureDialog.show(getTargetFragment());
}
Log.i(TAG, "failed: " + failed);
- if (!failed) {
+ if (failed) {
+ RemoveAccountFailureDialog.show(getTargetFragment());
+ } else {
targetActivity.finish();
}
}, null, mUserHandle);