Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Email into cm-13.0staging/cm-13.0+r22

Android 6.0.1 release 22

22 files changed, 43 insertions, 285 deletions

diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
deleted file mode 100644
index 81c2bbe22..000000000
--- a/res/values-az-rAZ/strings.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="6641407731311699536">"E-poçt qoşmalarını oxumaq"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"Tətbiqə e-poçt qoşmalarınızı oxumağa imkan verir."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"E-poçt provayder datasına giriş"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"Tətbiqə, qəbul edilmiş mesajlar, göndərilmiş mesajlar, istifadəçi adları və parollar daxil olmaqla, elektron poçt data bazanıza daxil olmağa imkan verir."</string>
-    <string name="app_name" msgid="2206468539066258195">"E-poçt"</string>
-    <string name="create_action" msgid="6575946089819721958">"Yenisini yaradın"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"Tez cavab yoxdur."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"Hesab ayarları"</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Gələnlər qutusu"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Gedənlər Qutusu"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Qaralamalar"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"Zibil qutusu"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"Göndərilmiş"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Zir-zibil"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Ulduzlu"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Oxunmamış"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Sazlama"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Birləşmiş görünüş"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Original Mesaj --------\nMövzu: <xliff:g id="SUBJECT">%1$s</xliff:g>\nKimdən: <xliff:g id="SENDER">%2$s</xliff:g>\nKimə: <xliff:g id="TO">%3$s</xliff:g>\nNüsxəni Alan: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Tez cavab daxil edin"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Çevik cavab daxil edin"</string>
-    <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Yönləndirdiyiniz mesajda bir və ya daha çox qoşma göndərilmədən öncə endiriləcək."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"Mesaj deşifrələnən zaman xəta baş verdi."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Bir və daha çox qoşma yönləndirilə bilmədi"</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"Qoşmalar yönləndirilmədi"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> giriş uğursuz oldu."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"Daxil ola bilmədi"</string>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"Hesab quraşdırma"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"Doğrulama sorğulanır"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"Daxil olun"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"Doğrulamaq olmur"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"E-poçt ünvanı və ya parol səhvdir"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"E-poçt ünvanı:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"E-poçt hesabı"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"Sadəcə bir neçə addımda hesabınızı quraşdıra bilərsiniz."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"E-poçt ünvanı"</string>
-    <string name="or_label" msgid="6408695162723653446">"VƏ YA"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google ilə daxil olun"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"PAROL"</string>
-    <string name="password_hint" msgid="4226682910292828279">"Parol"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s ilə daxil olunub"</string>
-    <string name="authentication_label" msgid="914463525214987772">"İDENTİFİKASİYA"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"İdentifikasiya əlavə et"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"İdentifikasiyanı təmizlə"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"Əl ilə quraşdırma"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Etibarlı e-poçt ünvanı və parol yazın."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Hesabın dublikatını çıxarın"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Siz artıq \"<xliff:g id="DUPLICATE">%s</xliff:g>\" hesabı üçün bu istifadəçi adını istifadə edirsiniz."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Hesab məlumatı əldə edilir…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Server xidmətləri təsdiq olunur…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Smtp ayarları təsdiq edilir..."</string>
-    <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Hesab yaradılır…"</string>
-    <string name="account_setup_ab_headline" msgid="1434091698882290052">"Hesab növünü təsdiqləyin"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Siz <xliff:g id="EMAIL">%1$s</xliff:g> e-poçtunu <xliff:g id="USERPROTOCOL">%2$s</xliff:g> istifadə edən olaraq qeyd etdiniz, lakin hesab <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> istifadə edə bilər."</string>
-    <string name="account_setup_names_headline" msgid="2031978210683887370">"Hesabınız quraşdırıldı və e-məktub yoldadır!"</string>
-    <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Hesab adı verin (istəyə görə)"</string>
-    <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Adınız (gedən mesajlarda göstərilir)"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Hesab növü"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Bu hansı növ hesabdır?"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Gələn server ayarları"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"İSTİFADƏÇİ ADI"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"PAROL"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"Parol"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"SERVER"</string>
-    <string name="account_setup_incoming_port_label" msgid="402562424498833560">"PORT:"</string>
-    <string name="account_setup_incoming_security_label" msgid="8360505617331971663">"GÜVƏNLİK NÖVÜ"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="2461510827337484818">"Heç biri"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="2834386066577239560">"SSL/TLS (Bütün sertifikatları qəbul et)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="5169133414545009342">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="2281920902104029077">"STARTTLS (bütün sertifikatları qəbul et)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="3892291833944170882">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="2341742235654301690">"E-poçtu serverdən sil"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="5777530843489961009">"Heç vaxt"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Gələnlər Qutusundan sildiyim zaman"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP cığır prefiksi"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"İstəyə görə"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Gedən server ayarları"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP SERVERİ:"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT:"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"GÜVƏNLİK NÖVÜ"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Daxil olmağı tələb edin"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"İSTİFADƏÇİ ADI"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"KLİENT SERTİFİKATI"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Seç"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Klient sertifikatı istifadə edin"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Sil"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Heç biri"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBİL CİHAZ ID\'Sİ"</string>
-    <string name="account_setup_options_headline" msgid="4810292194395251968">"Hesab seçənəkləri"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Sinx tezliyi:"</string>
-    <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Heç vaxt"</string>
-    <string name="account_setup_options_mail_check_frequency_push" msgid="5511415696925307797">"Avtomatik (Bas)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="8929785860545198867">"Hər 5 dəqiqə"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="8787901333816702849">"Hər 10 dəqiqə"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"Hər 15 dəqiqə"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"Hər 30 dəqiqə"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"Hər saat"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"E-məktub gələn zaman mənə xəbər ver"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="5029046373980454714">"Bu hesabdan kontaktları sinxronlaşdırın"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="303441956432308807">"Bu hesabdan təqvimi sinxronlaşdırın"</string>
-    <string name="account_setup_options_sync_email_label" msgid="468957966555663131">"Bu hesabdan e-poçtu sinxronlaşdırın"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="4085327585082867216">"Wi-Fi qoşulan zaman qoşmaları avtomatik endir"</string>
-    <string name="account_setup_failed_dlg_title" msgid="7923577224474005464">"Qurtarmaq olmur."</string>
-    <string name="account_setup_options_mail_window_label" msgid="4737241149297585368">"E-məktubları buradan sinx:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="7407981634952005775">"Avtomatik"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"Son gün"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"Son üç gün"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"Keçən həftə"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"Son iki həftə"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="3228265299330513816">"Keçən ay"</string>
-    <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Hamısı"</string>
-    <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Hesab defoltu istifadə edin"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"İstifadəçi adı və ya parol yanlışdır."</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Hesab quraşdırması ilə bağlı problem"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"İstifadəçi adının, parolun və hesab ayarlarının düzgün olduğunu təsdiqləyin."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Serverə təhlükəsiz qoşula bilməz."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"Serverə təhlükəsiz qoşula bilməz.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="4607859382193244795">"Klient sertifikatı tələb olunur. Klient sertifikatı olan serverə qoşulmaq istəyirsiniz?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="4574461885959029072">"Sertifikat etibarsızdır və ya girişsizdir."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="430054384233036305">"Server xəta ilə cavab verdi. İstifadəçi adınızı və parolu yoxlayaraq, yenidən cəhd edin."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="1180197172141077524">"Serverə qoşulmaq olmur."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="3889441611138037320">"Serverə qoşula bilmir.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_tls_required" msgid="1902309158359287958">"TLS tələb olunur, lakin server tərəfindən dəstəklənmir."</string>
-    <string name="account_setup_failed_auth_required" msgid="2684010997018901707">"Autentifikasiya metodları server tərəfindən dəstəklənmir."</string>
-    <string name="account_setup_failed_security" msgid="1627240499907011040">"Təhlükəsizlik xətasına görə server bağlantısı açıla bilmədi."</string>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"Serverə bağlantını aça bilmədi."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"Siz yanlış server ünvanı və ya E-poçtun dəstəkləmədiyi protokol versiyasını tələb edən server yazmısınız."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"Bu serverlə sinxronlaşmağa icazəniz yoxdur. Ətraflı məlumat üçün server administratoru ilə əlaqə saxlayın."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"Uzaqdan təhlükəsizlik idarəçiliyi"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"<xliff:g id="SERVER">%s</xliff:g> serveri Android cihazınızın özəlliklərini uzaqdan idarə etmək üçün icazə verməyinizi tələb edir. Bu hesabı quraşdırmağı bitirmək istəyirsiniz mi?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Bu server Android cihazınızın dəstəkləmədiyi təhlükəsizlik özəlliklərini tələb edir, həmçinin: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"XƏBƏRDARLIQ: Cihazınızı idarə etmək üçün e-poçt tətbiq səlahiyyətinin deaktiv olunması bunu tələb edən bütün e-poçt hesablarını siləcək. Buna e-poçt, kontaktlar, təqvim tədbirləri və digər data aiddir."</string>
-    <string name="account_security_dialog_title" msgid="7003032393805438164">"Təhlükəsizlik güncəllənməsi"</string>
-    <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> təhlükəsizlik ayarlarınızı güncəlləməyi tələb edir."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="3249185558872836884">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" təhlükəsizlik tələblərinə görə sinxronlaşa bilmir."</string>
-    <string name="security_needed_ticker_fmt" msgid="7099561996532829229">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" təhlükəsizlik ayarlarının güncəllənməsini tələb edir"</string>
-    <string name="security_changed_ticker_fmt" msgid="3823930420292838192">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" hesabı təhlükəsizlik ayarlarını dəyişdi; istifadəçidən heç nə tələb olunmur."</string>
-    <string name="security_notification_content_update_title" msgid="6321099538307807621">"Təhlükəsizlik güncəllənməsi tələb olunur"</string>
-    <string name="security_notification_content_change_title" msgid="615639963487448183">"Təhlükəsizlik siyasəti dəyişdirildi"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"Təhlükəsizlik siyasəti təmin edilə bilmir"</string>
-    <string name="account_security_title" msgid="6072273231606918870">"Cihaz təhlükəsizliyi"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="2527501853520160827">"<xliff:g id="SERVER">%s</xliff:g> serveri Android cihazınızın bəzi təhlükəsizlik özəlliklərini uzaqdan kontrol etmək üçün icazə istəyir."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="8155332642922842729">"Detallara düzəliş edin"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="5543005790538884060">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" Sizdən kilid ekranı PIN\'ini və ya parolu dəyişməyi tələb edir."</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"Ekran kilidi parolunun vaxtı keçir"</string>
-    <string name="password_expired_ticker" msgid="3098703963402347483">"Ekran kilidi PIN kodunun və parolun vaxtı keçdi."</string>
-    <string name="password_expired_content_title" msgid="7379094218699681984">"Ekran kilid kodunun vaxtı keçdi"</string>
-    <string name="password_expire_warning_dialog_title" msgid="4901499545146045672">"Ekran kilidi parolunun vaxtı keçir"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="1093389293050776319">"Siz ekran kilidi PIN\'inizi və ya parolunuzu tezliklə dəyişməlisiniz və ya <xliff:g id="ACCOUNT">%s</xliff:g> üçün olan data silinəcək. İndi dəyişdirilsin?"</string>
-    <string name="password_expired_dialog_title" msgid="7275534155170185252">"Ekran kilidi parolunun vaxtı keçdi"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"<xliff:g id="ACCOUNT">%s</xliff:g> datası cihazınızdan silinir. Onu bərpa etmək üçün PIN kilid kodunuzu və ya parolunuzu dəyişməlisiniz. İndi dəyişmək istəyirsiniz?"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Yadda saxlanmamış bütün dəyişiklik ləğv edilsin?"</string>
-    <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Qoşmaları endirin"</string>
-    <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Wi-Fi vasitəsilə sonuncu mesajlara qoşmaları avtomatik endir"</string>
-    <string name="account_settings_notify_label" msgid="8621226576645167987">"E-poçt bildirişləri"</string>
-    <string name="account_settings_summary" msgid="4733776978291376161">"Sinx tezliyi, bildirişlər və sair"</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"E-məktub gələn zaman bildiriş göndər"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"Sinxronlaşma tezliyi"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"Gələnlər ayarları"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"İstifadəçi adı, parol və digər gələn server ayarları"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"Gedən ayarlar"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"İstifadəçi adı, parol və digər gedən server ayarları"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"Məcburi siyasət"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"Heç biri"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"Dəstəklənməyən siyasətlər"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"Heç biri"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"Sinxronlaşdırmağa cəhd edin"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"Bu hesabı sinxronlaşdırmaq üçün buraya basın"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"Hesab adı"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"Adınız"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"Qısa cavablar"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"E-məktub yazan zaman tez-tez daxil etdiyiniz mətnə düzəliş edin"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"Bildiriş ayarları"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"Data istifadəsi"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"Təhlükəsizlik siyasəti"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"Sistem qovluqları"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"Zibil qovluğu"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"Serverinizin zibil qovluğunu seçin"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"Serverinizin zibil qovluğunu seçin"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"Göndərilmiş elementlər qovluğu"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"Serverinizin göndərilmiş elementlər qovluğunu seçin"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"Serverinizin göndərilmiş elementlər qovluğunu seçin"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"Qısa cavab"</string>
-    <string name="save_action" msgid="5740359453077441466">"Yadda saxlayın"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"Kontaktları sinxronlaşdırın"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"Bu hesab üçün olan kontaktları sinxronlaşdırın"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"Təqvimi sinxronlaşdır"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Bu hesab üçün təqvim tədbirini sinxronlaşdırın"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"E-poçtu sinxronlaşdır"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"E-poçtu bu hesab üçün sinxronlaşdırın"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrasiya"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"Zəng səsi seç"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"Server ayarları"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sinx seçənəkləri"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"Sinx seçənəkləri (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Bu qovluğu sinxronlaşdırın"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Mesajlar qoşulan zaman endirəcək"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Məktubun sinxronlaşma günləri"</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"Bu e-poçt hesabını ayarlamadan öncə, T-Online saytını ziyarət edin və POP3 e-poçt girişi üçün parol yaradın."</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"Hesab yaratmaq mümkün deyil. Yenidən cəhd edin."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"E-poçt"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"Server xüsusiyyətli təhlükəsizlik siyasətinə imkan verir"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Cihaz kamerasının istifadəsinə icazə verməyin"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"Cihaz parolu tələb edin"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"Son parolların yenidən istifadəsini məhdudlaşdırın"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"Parolların vaxtının keçməsini tələb edin"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"İstifadəsiz qalmış cihazın öz ekranını kilidləməsini tələb edin"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"Sinxronlaşmış təqvim tədbirlərinin sayını məhdudlaşdırın"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"Sinxronlaşmış e-poçt sayını məhdudlaşdırın"</string>
-    <string name="quick_1" msgid="9130521670178673190">"Təşəkkür edirik!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"Xoşuma gəlir!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"Bunu sonra oxuyacam və fikrimi bildirəcəm."</string>
-    <string name="quick_4" msgid="216066940197616025">"Bunu müzakirə etmək üçün görüş təyin edin."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"Cavab göndərilir..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Şəxsi (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Şəxsi (POP3)"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> üçün server zibil qovluğu seçin."</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> hesabı üçün server elementlər göndərdi"</string>
-    <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Qovluq siyahısı yüklənir…"</string>
-    <string name="no_quick_responses" msgid="8716297053803961304">"Heç biri əlçatan deyil"</string>
-    <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Qovluq sinx ayarları"</string>
-</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a5c6901c2..9e6a8f7b4 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -83,7 +83,7 @@
     <string name="account_setup_incoming_port_label" msgid="402562424498833560">"ПОРТ"</string>
     <string name="account_setup_incoming_security_label" msgid="8360505617331971663">"ТИП СИГУРНОСТ"</string>
     <string name="account_setup_incoming_security_none_label" msgid="2461510827337484818">"Няма"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="2834386066577239560">"SSL/TLS (Всички сертификати)"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="2834386066577239560">"SSL/TLS (Приемане на всички сертификати)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="5169133414545009342">"SSL/TLS"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="2281920902104029077">"STARTTLS (Приемане на всички сертификати)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="3892291833944170882">"STARTTLS"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index fdb9f526c..b75b6974b 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -69,7 +69,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"smtp সেটিংস যাচাই করা হচ্ছে..."</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"অ্যাকাউন্ট তৈরি হচ্ছে..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"অ্যাকাউন্টের ধরন নিশ্চিত করুন"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"আপনার মতে <xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g> ব্যবহার করে, কিন্তু হয়তো অ্যাকাউন্টটি <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> ব্যবহার করছে"</string>
+    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"আপনি ইঙ্গিত করেছেন যে <xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g> ব্যবহার করে, কিন্তু হয়তো অ্যাকাউন্টটি <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> ব্যবহার করছে"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"আপনার অ্যাকাউন্ট সেট আপ হয়েছে এবং ইমেল আসছে!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"এই অ্যাকাউন্টটির একটি নাম দিন (ঐচ্ছিক)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"আপনার নাম (আউটগোয়িং বার্তাগুলিতে প্রদর্শিত হয়)"</string>
@@ -159,14 +159,14 @@
     <string name="account_security_title" msgid="6072273231606918870">"ডিভাইস নিরাপত্তা"</string>
     <string name="account_security_policy_explanation_fmt" msgid="2527501853520160827">"আপনাকে <xliff:g id="SERVER">%s</xliff:g> সার্ভারটিকে আপনার Android ডিভাইসের কিছু নিরাপত্তা বৈশিষ্ট্যকে দূরবর্তীভাবে নিয়ন্ত্রণ করার অনুমতি দিতে হবে।"</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="8155332642922842729">"বিশদ বিবরণ সম্পাদন করুন"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="5543005790538884060">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" এর জন্য আপনার লক স্ক্রিনের পিন বা পাসওয়ার্ড পরিবর্তন করা প্রয়োজন।"</string>
+    <string name="password_expire_warning_ticker_fmt" msgid="5543005790538884060">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" এর জন্য আপনার লক স্ক্রিনের PIN বা পাসওয়ার্ড পরিবর্তন করা প্রয়োজন।"</string>
     <string name="password_expire_warning_content_title" msgid="4360288708739366810">"লক স্ক্রিন পাসওয়ার্ডের মেয়াদ শেষ হচ্ছে"</string>
-    <string name="password_expired_ticker" msgid="3098703963402347483">"আপনার লক স্ক্রিন পিন অথবা পাসওয়ার্ডের মেয়াদ শেষ হয়েছে।"</string>
+    <string name="password_expired_ticker" msgid="3098703963402347483">"আপনার লক স্ক্রিন PIN অথবা পাসওয়ার্ডের মেয়াদ শেষ হয়েছে।"</string>
     <string name="password_expired_content_title" msgid="7379094218699681984">"লকস্ক্রিন পাসওয়ার্ড মেয়াদশেষ"</string>
     <string name="password_expire_warning_dialog_title" msgid="4901499545146045672">"লক স্ক্রিন পাসওয়ার্ডের মেয়াদ শেষ হচ্ছে"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="1093389293050776319">"খুব শীঘ্রই আপনার লক স্ক্রিনের পিন বা পাসওয়ার্ড পরিবর্তন করা আবশ্যক, অথবা <xliff:g id="ACCOUNT">%s</xliff:g> এর ডেটা মুছে যাবে। আপনি কি এখনই এটি পরিবর্তন করতে চান?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="1093389293050776319">"খুব শীঘ্রই আপনার লক স্ক্রিনের PIN বা পাসওয়ার্ড পরিবর্তন করা আবশ্যক, অথবা <xliff:g id="ACCOUNT">%s</xliff:g> এর ডেটা মুছে যাবে। আপনি কি এখনই এটি পরিবর্তন করতে চান?"</string>
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"লক স্ক্রিন পাসওয়ার্ডের মেয়াদ শেষ হয়েছে"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"আপনার ডিভাইস থেকে <xliff:g id="ACCOUNT">%s</xliff:g> এর ডেটা মুছে ফেলা হচ্ছে। আপনি আপনার লক স্ক্রিন পিন অথবা পাসওয়ার্ড পরিবর্তন করে এটিকে পুনরুদ্ধার করতে পারেন। এটি এখনই পরিবর্তন করবেন?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"আপনার ডিভাইস থেকে <xliff:g id="ACCOUNT">%s</xliff:g> এর ডেটা মুছে ফেলা হচ্ছে। আপনি আপনার লক স্ক্রিন PIN অথবা পাসওয়ার্ড পরিবর্তন করে এটিকে পুনরুদ্ধার করতে পারেন। এটি এখনই পরিবর্তন করবেন?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"অসংরক্ষিত পরিবর্তনগুলি পরিত্যাগ করবেন?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"সংযুক্তিগুলি ডাউনলোড করুন"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Wi-Fi দ্বারা সাম্প্রতিক বার্তাগুলির সংযুক্তিগুলি স্বয়ং-ডাউনলোড করুন"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 3a9a591ca..110295df5 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -207,7 +207,7 @@
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronitza el correu electrònic"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronitza el correu del compte"</string>
     <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibra"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"Selecciona un so"</string>
+    <string name="account_settings_ringtone" msgid="2238523918221865167">"Tria un so"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Configuració del servidor"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opcions de sincronització"</string>
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"Opcions de sincronització (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e4c4dfdf7..24b95ee08 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -38,7 +38,7 @@
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Kurzantwort einfügen"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Kurzantwort einfügen"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Mindestens ein Anhang in Ihrer weitergeleiteten Nachricht wird vor dem Senden heruntergeladen."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"Beim Dekodieren der Nachricht ist ein Fehler aufgetreten."</string>
+    <string name="message_decode_error" msgid="91396461771444300">"Beim Entschlüsseln der Nachricht ist ein Fehler aufgetreten."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Mindestens ein Anhang wurde nicht weitergeleitet."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Anhang nicht weitergeleitet"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Anmeldung in <xliff:g id="ACCOUNT_NAME">%s</xliff:g> erfolglos"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b502df1d1..85ee4a09e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -68,7 +68,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Validando los ajustes del servidor…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Validando los ajustes de SMTP…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Creando cuenta…"</string>
-    <string name="account_setup_ab_headline" msgid="1434091698882290052">"Confirma el tipo de cuenta"</string>
+    <string name="account_setup_ab_headline" msgid="1434091698882290052">"Confirmar tipo de cuenta"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Has indicado que <xliff:g id="EMAIL">%1$s</xliff:g> utiliza <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, pero es posible que la cuenta utilice <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Tu cuenta ya está configurada y en breve verás tu correo."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Asigna un nombre a esta cuenta (opcional)"</string>
@@ -103,7 +103,7 @@
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Utilizar certificado de cliente"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Eliminar"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Ninguno"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID DEL DISPOSITIVO MÓVIL"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID DE DISPOSITIVO MÓVIL"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Opciones de cuenta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Frecuencia de sincronización:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nunca"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 61836c76f..faacda084 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -108,10 +108,10 @@
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Sinkronizazio-maiztasuna:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Inoiz ez"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5511415696925307797">"Automatikoa (push)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="8929785860545198867">"5 minutuz behin"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="8787901333816702849">"10 minutuz behin"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"15 minutuz behin"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"30 minutuz behin"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="8929785860545198867">"5 minuturo"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="8787901333816702849">"10 minuturo"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"15 minuturo"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"30 minuturo"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"Orduro"</string>
     <string name="account_setup_options_notify_label" msgid="3101529443722198112">"Jakinarazi mezu berriak iristen direnean"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="5029046373980454714">"Sinkronizatu kontu honen kontaktuak"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 420edfd19..924bcf5f5 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -128,7 +128,7 @@
     <string name="account_setup_options_mail_window_1month" msgid="3228265299330513816">"ماه گذشته"</string>
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"همه"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"استفاده از پیش‌فرض حساب"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"نام کاربری یا گذرواژه اشتباه است."</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"نام کاربری یا گذرواژهٔ شما اشتباه است."</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"مشکل در تنظیم حساب"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"تأیید کنید نام کاربری، گذرواژه، و تنظیمات حساب درست هستند."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"اتصال امن به سرور امکان‌پذیر نیست."</string>
@@ -167,7 +167,7 @@
     <string name="password_expire_warning_dialog_content_fmt" msgid="1093389293050776319">"باید پین قفل صفحه یا گذرواژهٔ خود را سریع تغییر دهید، در غیر اینصورت داده‌های <xliff:g id="ACCOUNT">%s</xliff:g> پاک خواهد شد . آیا می‌خواهید اکنون آن‌ را تغییر دهید؟"</string>
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"گذرواژه قفل صفحه منقضی شده است"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"داده‌های <xliff:g id="ACCOUNT">%s</xliff:g> در حال پاک شدن از دستگاه شما است. با تغییر دادن پین صفحه قفل یا گذرواژهٔ خود می‌توانید آن‌ها را بازگردانید. آیا می‌خواهید هم‌اکنون آن‌ را تغییر دهید؟"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"از تغییرات ذخیره نشده صرف‌نظر شود؟"</string>
+    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"از تغییرات ذخیره نشده صرفنظر شود؟"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"دانلود پیوست‌ها"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"‏دانلود خودکار پیوست‌ها به پیام‌های اخیر از طریق Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"اعلان‌های ایمیل"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 7ffc14424..cf30def4a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -128,7 +128,7 @@
     <string name="account_setup_options_mail_window_1month" msgid="3228265299330513816">"Viime kuukausi"</string>
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Kaikki"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Käytä tilin oletusta"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Käyttäjätunnus tai salasana on virheellinen."</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Käyttäjänimi tai salasana on virheellinen."</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Ongelma tilin asetuksissa"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Vahvista, että käyttäjätunnus, salasana ja tilin asetukset ovat oikein."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Palvelimeen ei voi muodostaa suojattua yhteyttä."</string>
@@ -175,9 +175,9 @@
     <string name="account_settings_notify_summary" msgid="88560545461159120">"Lähetä ilmoitus, kun sähköpostiviesti saapuu"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"Synkronoinnin tiheys"</string>
     <string name="account_settings_incoming_label" msgid="3793314460723296874">"Saapuvan postin asetukset"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"Käyttäjätunnus, salasana ja muut saapuvan postin palvelimen asetukset"</string>
+    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"Käyttäjänimi, salasana ja muut saapuvan postin palvelimen asetukset"</string>
     <string name="account_settings_outgoing_label" msgid="4997504719643828381">"Lähtevän postin asetukset"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"Käyttäjätunnus, salasana ja muut lähtevän postin palvelimen asetukset"</string>
+    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"Käyttäjänimi, salasana ja muut lähtevän postin palvelimen asetukset"</string>
     <string name="account_settings_enforced_label" msgid="7005050362066086119">"Käytännöt otettu käyttöön"</string>
     <string name="account_settings_enforced_summary" msgid="1668581504445370253">"Ei mitään"</string>
     <string name="account_settings_unsupported_label" msgid="7286722617178322465">"Käytäntöjä ei tueta"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 7021828fb..9b21d8fb0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -98,7 +98,7 @@
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TITKOSÍTÁS TÍPUSA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Bejelentkezés szükséges"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"FELHASZNÁLÓNÉV"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"ÜGYFÉL-TANÚSÍTVÁNY"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"ÜGYFÉLTANÚSÍTVÁNY"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Kijelölés"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Ügyféltanúsítvány használata"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Eltávolítás"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 8a3d054eb..87e547979 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -240,5 +240,5 @@
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Բեռնվում է պանակի ցանկը..."</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Ոչ մեկը հասանելի չէ"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Պանակի համաժամեցման կարգավորումները"</string>
+    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Թղթապանակի համաժամեցման կարգավորումները"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3d679a553..2b667c9e5 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -60,7 +60,7 @@
     <string name="authentication_label" msgid="914463525214987772">"AUTENTICAZIONE"</string>
     <string name="add_authentication_label" msgid="382998197798081729">"Aggiungi autenticazione"</string>
     <string name="clear_authentication_label" msgid="4750930803913225689">"Cancella autenticazione"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"Impostazione manuale"</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"Config. manuale"</string>
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Digita un indirizzo email e una password validi."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Account duplicato"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Utilizzi già questo nome utente per l\'account \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index c2df5627e..9c0daead8 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -69,7 +69,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"smtp ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ಪ್ರಮಾಣೀಕರಿಸಲಾಗುತ್ತಿದೆ..."</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"ಖಾತೆಯನ್ನು ರಚಿಸಲಾಗುತ್ತಿದೆ..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"ಖಾತೆ ಪ್ರಕಾರವನ್ನು ಖಚಿತಪಡಿಸಿ"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"<xliff:g id="EMAIL">%1$s</xliff:g> ಅವರು <xliff:g id="USERPROTOCOL">%2$s</xliff:g> ಅನ್ನು ಬಳಸುತ್ತಿದ್ದಾರೆಂದು ನೀವು ಸೂಚಿಸಿರುವಿರಿ. ಆದರೆ ಖಾತೆಯು <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> ಅನ್ನು ಬಳಸಬಹುದು"</string>
+    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"<xliff:g id="EMAIL">%1$s</xliff:g> ಅವರು <xliff:g id="USERPROTOCOL">%2$s</xliff:g> ಅನ್ನು ಬಳಸುತ್ತಾರೆಂದು ನೀವು ಸೂಚಿಸಿರುವಿರಿ. ಆದರೆ ಖಾತೆಯು <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> ಅನ್ನು ಬಳಸಬಹುದು"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಹೊಂದಿಸಲಾಗಿದೆ ಮತ್ತು ಇಮೇಲ್ ತನ್ನ ಮಾರ್ಗದಲ್ಲಿದೆ!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"ಈ ಖಾತೆಗೆ ಹೆಸರೊಂದನ್ನು ನೀಡಿ (ಐಚ್ಛಿಕ)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"ನಿಮ್ಮ ಹೆಸರು (ಹೊರಹೋಗುವ ಸಂದೇಶಗಳಲ್ಲಿ ಪ್ರದರ್ಶಿಸಲ್ಪಡುತ್ತದೆ)"</string>
@@ -148,12 +148,12 @@
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"ಸರ್ವರ್ <xliff:g id="SERVER">%s</xliff:g> ನಿಮ್ಮ Android ಸಾಧನದ ಕೆಲವು ಭದ್ರತಾ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನೀವು ದೂರದಿಂದಲೇ ಅದನ್ನು ನಿಯಂತ್ರಿಸುವಂತಹ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ. ನೀವು ಈ ಖಾತೆಯ ಸೆಟ್ಟಿಂಗ್‍ ಹೊಂದಿಸುವಿಕೆಯನ್ನು ಮುಕ್ತಾಯಗೊಳಿಸಲು ಬಯಸುವಿರಾ?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"ಈ ಸರ್ವರ್‍‍ಗೆ ನಿಮ್ಮ Android ಸಾಧನ ಬೆಂಬಲಿಸದಂತಹ ಭದ್ರತಾ ವೈಶಿಷ್ಟ್ಯಗಳ ಅಗತ್ಯವಿದೆ. ಇದನ್ನು ಒಳಗೊಂಡಿರುವಂತೆ: <xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ಎಚ್ಚರಿಕೆ: ನಿಮ್ಮ ಸಾಧನವನ್ನು ನಿರ್ವಹಿಸಲು ಇಮೇಲ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಕಾರವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಅವುಗಳ ಇಮೇಲ್, ಸಂಪರ್ಕಗಳು, ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್‌ಗಳು, ಮತ್ತು ಇತರೆ ಡೇಟಾ ಸೇರಿದಂತೆ ಎಲ್ಲಾ ಅಗತ್ಯವಿರುವ ಇಮೇಲ್ ಖಾತೆಗಳನ್ನು ಅಳಿಸುತ್ತದೆ."</string>
-    <string name="account_security_dialog_title" msgid="7003032393805438164">"ಭದ್ರತಾ ಅಪ್‌ಡೇಟ್‌‌"</string>
+    <string name="account_security_dialog_title" msgid="7003032393805438164">"ಭದ್ರತಾ ನವೀಕರಣ"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> ನಿಮ್ಮ ಭದ್ರತಾ ಸೆಟ್ಟಿಂಗ್‍‍ಗಳನ್ನು ನೀವು ನವೀಕರಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
     <string name="security_unsupported_ticker_fmt" msgid="3249185558872836884">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ಖಾತೆಯು ಭದ್ರತಾ ಅಗತ್ಯತೆಗಳಿಂದಾಗಿ ಸಿಂಕ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ."</string>
     <string name="security_needed_ticker_fmt" msgid="7099561996532829229">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ಖಾತೆಯು ಭದ್ರತಾ ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ನವೀಕರಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
     <string name="security_changed_ticker_fmt" msgid="3823930420292838192">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ಖಾತೆಯು ಅದರ ಭದ್ರತಾ ಸೆಟ್ಟಿಂಗ್‍‍ಗಳನ್ನು ಬದಲಿಸಿದೆ; ಯಾವುದೇ ಬಳಕೆದಾರನ ಕ್ರಿಯೆಯ ಅಗತ್ಯವಿಲ್ಲ."</string>
-    <string name="security_notification_content_update_title" msgid="6321099538307807621">"ಭದ್ರತಾ ಅಪ್‌ಡೇಟ್‌‌ ಅಗತ್ಯವಿದೆ"</string>
+    <string name="security_notification_content_update_title" msgid="6321099538307807621">"ಭದ್ರತಾ ನವೀಕರಣ ಅಗತ್ಯವಿದೆ"</string>
     <string name="security_notification_content_change_title" msgid="615639963487448183">"ಭದ್ರತಾ ನೀತಿಗಳನ್ನು ಬದಲಿಸಲಾಗಿದೆ"</string>
     <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"ಭದ್ರತಾ ನೀತಿಗಳನ್ನು ಪೂರೈಸಲಾಗಲಿಲ್ಲ"</string>
     <string name="account_security_title" msgid="6072273231606918870">"ಸಾಧನ ಭದ್ರತೆ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a575c886b..452248616 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -69,7 +69,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Tikrinami SMTP nustatymai…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Kuriama paskyra…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Paskyros tipo patvirtinimas"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Nurodėte, kad <xliff:g id="EMAIL">%1$s</xliff:g> naudojamas protokolas „<xliff:g id="USERPROTOCOL">%2$s</xliff:g>“, bet paskyroje gali būti naudojamas protokolas „<xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>“"</string>
+    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Nurodėte, kad <xliff:g id="EMAIL">%1$s</xliff:g> naudojamas protokolas <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, bet paskyroje gali būti naudojamas protokolas <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Paskyra nustatyta, el. laiškas išsiųstas!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Suteikti šiai paskyrai pavadinimą (pasirenkama)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Jūsų vardas ir pavardė (pateikiami siunčiamuose pranešimuose)"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 3c08eaf5a..244eff524 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -69,7 +69,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"smtp ക്രമീകരണങ്ങൾ മൂല്യനിർണ്ണയം ചെയ്യുന്നു…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"അക്കൗണ്ട് സൃഷ്‌ടിക്കുന്നു…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"അക്കൗണ്ട് തരം സ്ഥിരീകരിക്കുക"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"<xliff:g id="EMAIL">%1$s</xliff:g> , <xliff:g id="USERPROTOCOL">%2$s</xliff:g> ഉപയോഗിക്കുന്നതായി നിങ്ങൾ സൂചിപ്പിച്ചു, പക്ഷെ അക്കൗണ്ട് <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> ഉപയോഗിച്ചേക്കാം"</string>
+    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"<xliff:g id="USERPROTOCOL">%2$s</xliff:g> ആണ് <xliff:g id="EMAIL">%1$s</xliff:g> ഉപയോഗിക്കുന്നതെന്ന് നിങ്ങൾ സൂചിപ്പിച്ചു, എന്നാൽ അക്കൗണ്ട് <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> എന്നത് ഉപയോഗിച്ചേക്കാം"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"നിങ്ങളുടെ അക്കൗണ്ട് സജ്ജീകരിച്ചു, ഇമെയിൽ ഉടൻ ലഭിച്ചുതുടങ്ങും!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"ഈ അക്കൗണ്ടിന് ഒരു പേര് നൽകുക (ഓപ്‌ഷണൽ)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"നിങ്ങളുടെ പേര് (ഔട്ട്ഗോയിംഗ് സന്ദേശങ്ങളിൽ പ്രദർശിപ്പിച്ചിരിക്കുന്നു)"</string>
@@ -83,12 +83,12 @@
     <string name="account_setup_incoming_port_label" msgid="402562424498833560">"പോർട്ട്"</string>
     <string name="account_setup_incoming_security_label" msgid="8360505617331971663">"സുരക്ഷ തരം"</string>
     <string name="account_setup_incoming_security_none_label" msgid="2461510827337484818">"ഒന്നുമില്ല"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="2834386066577239560">"SSL/TLS (സർട്ടിഫിക്കറ്റെല്ലാം അംഗീകരിക്കുന്നു)"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="2834386066577239560">"SSL/TLS (എല്ലാ സർട്ടിഫിക്കറ്റുകളും അംഗീകരിക്കുന്നു)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="5169133414545009342">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="2281920902104029077">"STARTTLS (എല്ലാം അംഗീകരിക്കുക)"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="2281920902104029077">"STARTTLS (എല്ലാ സർട്ടിഫിക്കറ്റുകളും അംഗീകരിക്കുന്നു)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="3892291833944170882">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="2341742235654301690">"സെർവറിൽ നിന്നും ഇമെയിൽ ഇല്ലാതാക്കുക"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="5777530843489961009">"ഒരിക്കലും"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="5777530843489961009">"ഒരിക്കലുമില്ല"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"ഞാൻ ഇൻബോക്‌സിൽ നിന്നും ഇല്ലാതാക്കുമ്പോൾ"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP പാത്ത് പ്രീഫിക്സ്"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"ഓപ്‌ഷണൽ"</string>
@@ -106,7 +106,7 @@
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"മൊബൈൽ ഐഡി"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"അക്കൗണ്ട് ഓപ്‌ഷനുകൾ"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"സമന്വയ ആവൃത്തി:"</string>
-    <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"ഒരിക്കലും"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"ഒരിക്കലുമില്ല"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5511415696925307797">"യാന്ത്രികം (പുഷ് ചെയ്യുക)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="8929785860545198867">"ഓരോ 5 മിനിറ്റിലും"</string>
     <string name="account_setup_options_mail_check_frequency_10min" msgid="8787901333816702849">"ഓരോ 10 മിനിറ്റിലും"</string>
@@ -117,7 +117,7 @@
     <string name="account_setup_options_sync_contacts_label" msgid="5029046373980454714">"ഈ അക്കൗണ്ടിൽ നിന്നും കോൺടാക്റ്റുകൾ സമന്വയിപ്പിക്കുക"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="303441956432308807">"ഈ അക്കൗണ്ടിൽ നിന്നും കലണ്ടർ സമന്വയിപ്പിക്കുക"</string>
     <string name="account_setup_options_sync_email_label" msgid="468957966555663131">"ഈ അക്കൗണ്ടിൽ നിന്നും ഇമെയിൽ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="4085327585082867216">"വൈഫൈ യിൽ കണക്റ്റുചെയ്‌തിരിക്കുമ്പോൾ അറ്റാച്ചുമെന്റുകൾ യാന്ത്രികമായി ഡൗൺലോഡുചെയ്യുക"</string>
+    <string name="account_setup_options_background_attachments_label" msgid="4085327585082867216">"Wi-Fi യിൽ കണക്റ്റുചെയ്‌തിരിക്കുമ്പോൾ അറ്റാച്ചുമെന്റുകൾ യാന്ത്രികമായി ഡൗൺലോഡുചെയ്യുക"</string>
     <string name="account_setup_failed_dlg_title" msgid="7923577224474005464">"പൂർത്തിയാക്കാനായില്ല"</string>
     <string name="account_setup_options_mail_window_label" msgid="4737241149297585368">"ഇതിൽ നിന്ന് ഇമെയിലുകൾ സമന്വയിപ്പിക്കുക:"</string>
     <string name="account_setup_options_mail_window_auto" msgid="7407981634952005775">"യാന്ത്രികം"</string>
@@ -136,8 +136,8 @@
     <string name="account_setup_failed_certificate_required" msgid="4607859382193244795">"ഒരു ക്ലയന്റ് സർട്ടിഫിക്കറ്റ് ആവശ്യമാണ്. ഒരു ക്ലയന്റ് സർട്ടിഫിക്കറ്റ് ഉപയോഗിച്ച് സെർവറിൽ കണക്റ്റുചെയ്യേണ്ടതുണ്ടോ?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4574461885959029072">"സർട്ടിഫിക്കറ്റ് അസാധുവോ ആക്‌സസ്സുചെയ്യാനാകാത്തതോ ആണ്."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="430054384233036305">"സെർവർ പ്രതികരണത്തിൽ പിശക്. നിങ്ങളുടെ ഉപയോക്തൃനാമവും പാസ്‌വേഡും പരിശോധിച്ചതിനുശേഷം വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="1180197172141077524">"സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനാകുന്നില്ല."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="3889441611138037320">"സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനാകുന്നില്ല.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_server_message" msgid="1180197172141077524">"സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനാകില്ല."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="3889441611138037320">"സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="1902309158359287958">"TLS ആവശ്യമാണെങ്കിലും സെർവർ പിന്തുണയ്‌ക്കുന്നില്ല."</string>
     <string name="account_setup_failed_auth_required" msgid="2684010997018901707">"പ്രാമാണീകരണ രീതികളെ സെർവർ പിന്തുണയ്‌ക്കുന്നില്ല."</string>
     <string name="account_setup_failed_security" msgid="1627240499907011040">"സുരക്ഷാ പിശകിനാൽ സെർവറിലേക്ക് കണക്ഷൻ തുറക്കാനായില്ല."</string>
@@ -169,7 +169,7 @@
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"നിങ്ങളുടെ ഉപകരണത്തിൽ നിന്നും <xliff:g id="ACCOUNT">%s</xliff:g> എന്നതിനായുള്ള ഡാറ്റ മായ്ച്ചുകൊണ്ടിരിക്കുന്നു.. നിങ്ങളുടെ ലോക്ക് സ്‌ക്രീൻ PIN അല്ലെങ്കിൽ പാസ്‌വേഡ് മാറ്റുന്നതിലൂടെ നിങ്ങൾക്ക് അത് പുനഃസ്ഥാപിക്കാനാകും. നിങ്ങൾക്ക് അത് ഇപ്പോൾ മാറ്റണമെന്നുണ്ടോ?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"സംരക്ഷിക്കാത്ത മാറ്റങ്ങൾ നിരസിക്കണോ?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"അറ്റാച്ചുമെന്റുകൾ ഡൗൺലോഡുചെയ്യുക"</string>
-    <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"വൈഫൈ മുഖേന പുതിയ സന്ദേശങ്ങളിലേക്ക് അറ്റാച്ചുമെന്റുകൾ യാന്ത്രികമായി ഡൗൺലോഡുചെയ്യുക"</string>
+    <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Wi-Fi മുഖേന പുതിയ സന്ദേശങ്ങളിലേക്ക് അറ്റാച്ചുമെന്റുകൾ യാന്ത്രികമായി ഡൗൺലോഡുചെയ്യുക"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"ഇമെയിൽ അറിയിപ്പുകൾ"</string>
     <string name="account_settings_summary" msgid="4733776978291376161">"സമന്വയ ആവർത്തനം, അറിയിപ്പ് മുതലായവ"</string>
     <string name="account_settings_notify_summary" msgid="88560545461159120">"ഇമെയിൽ ലഭിക്കുമ്പോൾ അറിയിപ്പ് അയയ്‌ക്കുക"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 5405be8d4..9db814011 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -83,7 +83,7 @@
     <string name="account_setup_incoming_port_label" msgid="402562424498833560">"PORT"</string>
     <string name="account_setup_incoming_security_label" msgid="8360505617331971663">"JENIS KESELAMATAN"</string>
     <string name="account_setup_incoming_security_none_label" msgid="2461510827337484818">"Tiada"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="2834386066577239560">"SSL/TLS (Terima semua sijil)"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="2834386066577239560">"SSL/TLS (Terima semua perakuan)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="5169133414545009342">"SSL/TLS"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="2281920902104029077">"STARTTLS (terima semua perakuan)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="3892291833944170882">"STARTTLS"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8aa9d3bf6..2eaad32c8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -69,7 +69,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Bekrefter smtp-innstillingene ..."</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Oppretter kontoen ..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Bekreft kontotypen"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Du har angitt at <xliff:g id="EMAIL">%1$s</xliff:g> bruker <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, men kontoen bruker muligens <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
+    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Du har angitt at <xliff:g id="EMAIL">%1$s</xliff:g> bruker <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, men kontoen bruker kanskje <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Kontoen din er konfigurert, og innkommende e-poster er på vei."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Gi kontoen navn (valgfritt)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Navnet ditt (vises på utgående e-poster)"</string>
@@ -103,7 +103,7 @@
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Bruk klientsertifikat"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Fjern"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Ingen"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID FOR MOBILENHET"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBILENHETS-ID"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Alternativer for konto"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Synkroniseringsfrekvens:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Aldri"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ffb72f02c..45e79cf00 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -98,7 +98,7 @@
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"BEVEILIGINGSTYPE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Aanmelding vereisen"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"GEBRUIKERSNAAM"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFICAAT CLIENT"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CLIENTCERTIFICAAT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Selecteren"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Klantcertificaat gebruiken"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Verwijderen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7ed9a0ef8..d58c71da4 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -69,7 +69,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Sprawdzam ustawienia SMTP…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Tworzę konto…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Potwierdź typ konta"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Wskazałeś, że adres <xliff:g id="EMAIL">%1$s</xliff:g> korzysta z protokołu <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, ale konto może używać protokołu <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
+    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Wskazałeś, że adres <xliff:g id="EMAIL">%1$s</xliff:g> korzysta z protokołu <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, ale konto może używać protokołu <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Konto zostało skonfigurowane, a e-maile są w drodze."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Nazwa konta (opcjonalnie)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Twoja nazwa (wyświetlana w wiadomościach wychodzących)"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 499711020..e8da4a777 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -69,7 +69,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"A validar as configurações de smtp..."</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"A criar conta..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Confirmar tipo de conta"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Indicou que <xliff:g id="EMAIL">%1$s</xliff:g> utiliza <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, mas a conta poderá utilizar o <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Indicou que <xliff:g id="EMAIL">%1$s</xliff:g> utiliza <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, mas a conta poderá utilizar <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"A sua conta está configurada e o email vai a caminho!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Dar um nome a esta conta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"O seu nome (apresentado nas mensagens enviadas)"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 388c822dd..55a03e104 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -69,7 +69,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Overujú sa nastavenia SMTP…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Účet sa vytvára…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Potvrďte typ účtu"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Uviedli ste, že účet <xliff:g id="EMAIL">%1$s</xliff:g> používa protokol <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, možno však používa protokol <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
+    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Uviedli ste, že účet <xliff:g id="EMAIL">%1$s</xliff:g> používa protokol <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, ale môže používať aj protokol <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Váš účet je nastavený a&amp;nbsp;pošta je na ceste!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Pomenujte tento účet (nepovinné)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Vaše meno (zobrazované na odchádzajúcich správach)"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 5ee894c6d..d046806a5 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -34,7 +34,7 @@
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"بغیر پڑھے ہوئے"</string>
     <string name="debug_title" msgid="1337476992195531309">"ڈیبگ کریں"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"مشترکہ منظر"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- اصل پیغام --------\nموضوع: <xliff:g id="SUBJECT">%1$s</xliff:g>\nمنجانب: <xliff:g id="SENDER">%2$s</xliff:g>\nبنام: <xliff:g id="TO">%3$s</xliff:g>\nسی سی: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">"‏\n\n-------- اصل پیغام --------\nموضوع: <xliff:g id="SUBJECT">%1$s</xliff:g>\nمنجانب: <xliff:g id="SENDER">%2$s</xliff:g>\nبنام: <xliff:g id="TO">%3$s</xliff:g>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"فوری جواب داخل کریں"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"فوری جواب داخل کریں"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"آپ کے فارورڈ کیے ہوئے پیغام میں ایک یا زیادہ منسلکات بھیجنے سے پہلے ڈاؤن لوڈ ہوں گے۔"</string>