am c4127f91: (-s ours) am 46fadb5f: (-s ours) Import translations. DO NOT MERGE

* commit 'c4127f91eb9c1f46e2c1b3d1f6184926817ed866':
  Import translations. DO NOT MERGE
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 4103172..a3e13de 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Kry toegang tot e-posverskafferdata"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Laat die program toe om toegang te kry tot jou e-posdatabasis, insluitend ontvangde boodskappe, gestuurde boodskappe, gebruikername en wagwoorde."</string>
     <string name="app_name" msgid="2206468539066258195">"E-pos"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Ontfout"</string>
     <string name="create_action" msgid="6575946089819721958">"Skep nuwe"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Geen vinnige reaksies nie."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Rekeninginstellings"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Verbindingsprobleem."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Skuif boodskappe"</item>
+    <item quantity="other" msgid="5083310421670206821">"Skuif boodskappe"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Skuif word nie op POP3-rekeninge ondersteun nie."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Kan nie skuif nie, omdat keuse verskeie rekeninge bevat."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Boodskappe in Konsepte, Uitkassie en Gestuur kan nie geskuif word nie."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Inkassie"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Uitkassie"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Konsepte"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Gemorspos"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Gester"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Ongelees"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Ontfout"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Inkassie"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Gester"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Konsepte"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Uitkassie"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Gekombineerde aansig"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Oorspronklike boodskap --------\nOnderwerp: <xliff:g id="SUBJECT">%1$s</xliff:g>\nVan: <xliff:g id="SENDER">%2$s</xliff:g>\nAan: <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">"Voer vinnige antwoord in"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Voer vinnige antwoord in"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Een of meer aanhegsels in jou aangestuurde boodskap sal afgelaai word voor dit gestuur word."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Kon nie die aanhegsel aflaai nie."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Daar was \'n fout tydens die dekodering van die boodskap."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Kon een of meer aanhegsels nie aanstuur nie"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Aanhegsel nie aangestuur nie"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> se aanmelding is onsuksesvol."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Kan nie aanmeld nie"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Rekening-opstelling"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Versoek tans magtiging"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Meld aan"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Voer asseblief \'n geldige e-posadres en wagwoord in."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Duplikaatrekening"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Jy gebruik reeds hierdie gebruikernaam vir die rekening \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Die wagwoord begin of eindig met een of meer spasies. Baie bedieners ondersteun nie wagwoorde wat spasies bevat nie."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Haal tans rekeninginligting op…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Valideer tans bedienerinstellings..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Valideer tans SMTP-instellings..."</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Skep tans rekening..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Bevestig rekeningtipe"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Jy het aangedui dat <xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g> gebruik, maar die rekening kan dalk <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> gebruik"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Rekening-opstelling"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Jou rekening is opgestel en die e-pos is op pad!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Gee hierdie rekening \'n naam (opsioneel)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Jou naam (staan op uitgaande boodskappe)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Hierdie veld kan nie leeg wees nie."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Rekening-opstelling"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Rekeningtipe"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Watter soort rekening is dit?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Rekening-opstelling"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Inkomende bedienerinstellings"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"GEBRUIKERNAAM"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"WAGWOORD"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Wanneer ek uit my inkassie uitvee"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP-pad-voorvoegsel"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Opsioneel"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Rekening-opstelling"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Instellings vir uitgaande bediener"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP-BEDIENER"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"POORT"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"SEKURITEITTIPE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Vereis aanmelding"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"GEBRUIKERNAAM"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"WAGWOORD"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"KLIËNTSERTIFIKAAT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Kies"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Gebruik kliëntsertifikaat"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Verwyder"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Geen"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBIELE TOESTEL SE ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Rekeninginstellings"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Rekeningopsies"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Sinkroniseringfrekwensie:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nooit"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Alle"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Gebruik verstek rekening"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Gebruikernaam of wagwoord verkeerd."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Aanmelding het misluk.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Probleem met rekeningopstelling"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Bevestig dat gebruikernaam, wagwoord en rekeninginstellings korrek is."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Kan nie veilig aan bediener koppel nie."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Afstand-sekuriteitsadministrasie"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Die bediener <xliff:g id="SERVER">%s</xliff:g> vereis dat jy dit toelaat om sekere sekuriteitskenmerke van jou Android-toestel afgeleë te beheer. Wil jy hierdie rekening klaar opstel?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Hierdie bediener vereis sekuriteitskenmerke wat jou Android-toestel nie ondersteun nie, insluitende: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Jy kan nie \'n rekening se gebruikernaam verander nie. Om \'n rekening met \'n ander gebruikernaam by te voeg, raak \"Voeg rekening by\"."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"LET WEL: Deaktivering van die e-posprogram se magtiging om jou toestel te administreer, sal alle e-posrekeninge wat dit benodig, uitvee, asook hul e-posse, kontakte, kalendergebeure en ander data."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Sekuriteitsopdatering"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> vereis dat jy jou sekuriteitsinstellings opdateer."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Wagwoord vir skermslot het verval"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Die data vir <xliff:g id="ACCOUNT">%s</xliff:g> word uit jou toestel gevee. Jy kan dit teruglaai deur jou skermslot-PIN of -wagwoord te verander. Wil jy dit nou verander?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Raak van ongestoorde veranderinge ontslae?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Kon nie aanmeld nie."</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Die gebruikernaam of wagwoord vir <xliff:g id="ACCOUNT">%s</xliff:g> is verkeerd. Wil jy dit nou opdateer?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Jou aanmelding by <xliff:g id="ACCOUNT">%s</xliff:g> het misluk; die bediener het gesê: <xliff:g id="REASON">%s</xliff:g> Wil jy jou gebruikernaam en/of wagwoord opdateer?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Laai aanhegsels af"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Laai outomaties aanhegsels van onlangse boodskappe via Wi-Fi af"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"E-poskennisgewings"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinkroniseer kalendergebeurtenis uit hierdie rekening"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sinkroniseer e-pos"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sinkroniseer e-pos vir hierdie rekening"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibreer"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibreer"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Kies \'n luitoon"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Bedienerinstellings"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sinkroniseeropsies"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sinkroniseer hierdie vouer"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Alle boodskappe sal afgelaai word wanneer jy gekoppel is"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Dae se pos om te sinkroniseer"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Stuurderprent"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Slegs sekere \"Plus\"-rekeninge sluit POP-toegang in wat hierdie program in staat stel om te koppel. As jy nie kan aanmeld met jou korrekte e-posadres en wagwoord nie, het jy dalk nie \'n betaalde \"Plus\"-rekening nie. Maak die webblaaier oop om toegang tot hierdie e-posrekeninge te kry."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Voor jy hierdie e-posrekening opstel, besoek asseblief die T-Online-webwerf en skep \'n wagwoord vir POP3-e-postoegang."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Korporatief"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Kon nie die rekening skep nie. Probeer weer."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-pos"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Aktiveer bedienergespesifiseerde veiligheidsbeleide"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Instellings"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Algemene instellings"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Bevestig voor uitvee"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Bevestig voor stuur"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Deursoek e-pos"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Weier gebruik van die toestel se kamera"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Vereis toestelwagwoord"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Beperk die hergebruik van onlangse wagwoorde"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Klink vir my goed!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Ek sal dit later lees en jou antwoord."</string>
     <string name="quick_4" msgid="216066940197616025">"Kom ons skeduleer \'n vergadering om dit te bespreek."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Agtergrond-sinkronisasie vir hierdie rekening is gedeaktiveer tydens swerwing."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Stuur tans antwoord..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Persoonlike (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Persoonlike (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Geen boodskappe nie."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Vouerkieser"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Kies bediener se asblikvouer vir <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Kies bedienergestuurde items se vouer vir <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Laai tans vouerlys..."</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Geen beskikbaar nie"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Vouersinkronisasie-instellings"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 153152f..b46351c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"የኢሜይል አቅራቢ ውሂብ ድረስ።"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">" የኢሜይል የውሂብ ጎታህን፣ የደረሱ መልዕክቶች፣ የተላኩ መልዕክቶች፣ ተጠቃሚ ስሞች እና የይለፍ ቃሎችን ጨምሮ ለመድረስ ለመተግበሪያ ይፈቅዳል።"</string>
     <string name="app_name" msgid="2206468539066258195">"ኢሜይል"</string>
+    <string name="debug_title" msgid="1337476992195531309">"አርም"</string>
     <string name="create_action" msgid="6575946089819721958">"አዲስ ፍጠር"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"ምንም ፈጣን ምላሾች የሉም።"</string>
     <string name="account_settings_action" msgid="589969653965674604">"መለያ ቅንብሮች"</string>
+    <string name="status_network_error" msgid="526826323872477973">"የግንኙነት ችግር::"</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"መልዕክት አንቀሳቅስ"</item>
+    <item quantity="other" msgid="5083310421670206821">"መልዕክቶች አንቀሳቅስ"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"አንቀሳቅስ በPOP3 መለያዎች የሚደገፍ  አይደለም።"</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"ምርጫው ብዙ መለያዎች ስለያዘ ማንቀሳቀስ አልተቻለም።"</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"በረቂቅ ውስጥ፣ የወጪ መልዕክት ሳጥን እና የተላኩ መልዕክቶች መንቀሳቀስ  አይችሉም።"</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"ገቢ መልዕክት"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"የወጪ መልዕክት ሳጥን"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"ረቂቆች"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"አላስፈላጊ መልዕክት"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"ኮከብ የተደረገባቸው"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"ያልተነበበ"</string>
-    <string name="debug_title" msgid="1337476992195531309">"አርም"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"ገቢ መልዕክት"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"ኮከብ የተደረገባቸው"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"ረቂቆች"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"የወጪ መልዕክት ሳጥን"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"ዓባሪውን ማውረድ አልተቻለም::"</string>
     <string name="message_decode_error" msgid="91396461771444300">"መልዕክቱን በማመሳጠር ላይ ስህተት ነበር::"</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"አንድ ወይም ከዛ በላይ ዓባሪዎችን ለማስተላለፍ አልተቻለም::"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"አባሪ አልተላለፈም"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> በመለያ መግባት አልተሳካም።"</string>
     <string name="login_failed_title" msgid="1737884069957090004">"በመለያ መግባት አልተቻለም፡፡"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"መለያ አዘጋጅ"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"ፈቀዳን በመጠየቅ ላይ"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"በመለያ ይግቡ"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"እባክህ ትክክለኛ ኢሜይል አድራሻ እና ይለፍ ቃል ፃፍ።"</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"ተመሳሳይ መለያ"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"ለመለያ \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ይህን ተጠቃሚ ስም ቀደም ሲል እየተጠቀምክበት ነው::"</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"ይህ ይለፍ ቃል በአንድ ወይም ከዛበላይ ቁምፊዎች ይጀምራል ወይም ይጨርሳል። አብዛኛው አገልጋዮች ይልፍ ቃሎችን ከባዶ ቦታዎች ጋር አይደግፉም።"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"የመለያ መረጃ ሰርስሮ በማውጣት ላይ..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"የአገልጋይ ቅንብሮችን በማረጋገጥ ላይ…"</string>
     <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_names_title" msgid="8780121351085082269">"መለያ አዘጋጅ"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"ይህ መስክ ባዶ መሆን አይችልም።"</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"መለያ አዘጋጅ"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"መለያ አይነት"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"ይህምንአይነት መለያ ነው?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"መለያ አዘጋጅ"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"የገቢ አገልጋይ ቅንብሮች"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"የተጠቃሚ ስም"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"የይለፍ ቃል"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"መለያ አዘጋጅ"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"የወጪ አገልጋይ ቅንብሮች"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP አገልጋይ"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ወደብ"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"የደህንነት አይነት"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"ከፍቶ መግባት ይፈልጋል"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"የተጠቃሚ ስም"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"የይለፍ ቃል"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"የደንበኛ ምስክር ወረቀት"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"ምረጥ"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"የደንበኛ ዕውቅና ማረጋገጫ  ተጠቀም"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"አስወግድ"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"የለም"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"የተንቀሳቃሽ መሣሪያ መታወቂያ"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"መለያ ቅንብሮች"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"መግባት አልተሳካም።\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"የሩቅ አስተዳደር ደህንነት"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"የመለያውን ተጠቃሚ ስም መለወጥ አይችሉም። መለያውን በተለየ ተጠቃሚ ስም ለማከል መለያ አክልን ይንኩ።"</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ማስጠንቀቂያ፣ መሣሪያህን ለማስተዳደር የኢሜይል ትግበራዎችን ኃላፊነት ማቦዘን የሚጠይቁትን ሁሉ የኢሜይል መለያዎች ከኢሜይል፣ ዕውቂያዎች፣ ቀን መቁጠሪያ ክስተቶች፣ እና ሌላ ውሂብ ጋር አብሮ ይሰርዛል።"</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>
@@ -168,6 +207,9 @@
     <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_login_dialog_title" msgid="2250911725501042470">"በመለያ መግባት አልተቻለም፡፡"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"የ<xliff:g id="ACCOUNT">%s</xliff:g> የተጠቃሚው ስም ወይም ይለፍ ቃል የተሳሳተ ነው። አሁን ልታዘምናቸው ትፈልጋለህ?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"ወደ <xliff:g id="ACCOUNT">%s</xliff:g> በምዝገባ መግባትዎ ተሰናክሏል፥ አገልጋዩ፥ <xliff:g id="REASON">%s</xliff:g> የተጠቃሚ ስምዎትን እና/ወይም የይለፍ ቃልዎን ማዘመን ይፈልጋሉ? ብሏል"</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>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ለእዚህ መለያ የቀን መቁጠሪያ ክስተት አስምር"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ኢሜይል አስምር"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ለእዚህ መለያ ኢሜይል አስምር"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"ንዘር"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"ንዘር"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"የደወል ቅላጼ ምረጥ"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"የአገልጋይ ቅንብሮች"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"አስምር አማራጮች"</string>
@@ -214,7 +256,10 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"ይህንን ዓቃፊ ያመሳስሉ"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"በሚገናኝበት ጊዜ መልዕክቶች ይወርዳሉ"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"ለአስምር የደብዳቤ ቀኖች"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"የላኪ ምስል"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"ጥቂት \"Plus\" መለያዎች ይህን ፕሮግራም ለማገናኘት ብቻ የPOP ድረስ ያካትታሉ። ከትክክለኛ ኢሜይል አድራሻህ እና የይለፍ ቃልህን ማስገባት ካልቻልክ የተከፈለበት የ\"Plus\" መለያ ሊኖርህ አይችልም። እባክህ ወደ እነዚህ የመልዕክት መለያዎች መዳረሻ ለማግኘት የድረ አሳሹን አስነሳ።"</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"ይህን ኢሜይል ከመፍጠርህ በፊት፣ የT-Online ድረ ጣቢያን ጎብኝ እና ለPOP3 ኢሜይል ለመድረስ ይለፍ ቃል ፍጠር።"</string>
+    <string name="exchange_name" msgid="3793803477985438102">"ኮርፖሬት"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"የማይክሮሶፍት Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"መለያውን መፍጠር አልቻለም:: እባክህ እንደገና ሞክር።"</string>
     <string name="device_admin_label" msgid="3335272972461391415">"ኢሜይል"</string>
@@ -230,13 +275,15 @@
     <string name="quick_2" msgid="8611591278119481491">"ለእኔ ጥሩ ይመስላል!"</string>
     <string name="quick_3" msgid="8070999183033184986">"በኋላ ይሄንን አነበዋለሁ እና ወደ እርስዎ እመለሳለሁ።"</string>
     <string name="quick_4" msgid="216066940197616025">"ይሄንን ለመወያየት ስብሰባ እናዋቅር።"</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"ውጫዊ አገልግሎት በማድረግ ጊዜ የዳራ ማመሳሰል ለእዚህ መለያ ቦዝኗል፡፡"</string>
     <string name="confirm_response" msgid="6764021931370809514">"ምላሽ በመላክ ላይ..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"የግል (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"የግል (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"መልዕክቶች የሉም።"</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"የአቃፊ መራጭ"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"ለ<xliff:g id="ACCOUNT">%s</xliff:g> የአገልጋይ መጣያ ይምረጡ"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"የተላኩ የ<xliff:g id="ACCOUNT">%s</xliff:g> ንጥሎች አገልጋይን ምረጥ"</string>
     <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>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index da06caf..c6a7e7c 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"الدخول إلى بيانات موفر البريد الإلكتروني"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"للسماح للتطبيق بالدخول إلى قاعدة بيانات بريدك الإلكتروني، بما في ذلك الرسائل المستلمة والرسائل المرسلة وأسماء المستخدمين وكلمات المرور."</string>
     <string name="app_name" msgid="2206468539066258195">"بريد"</string>
+    <string name="debug_title" msgid="1337476992195531309">"تصحيح الأخطاء"</string>
     <string name="create_action" msgid="6575946089819721958">"إنشاء رد جديد"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"ليست هناك ردود سريعة."</string>
     <string name="account_settings_action" msgid="589969653965674604">"إعدادات الحساب"</string>
+    <string name="status_network_error" msgid="526826323872477973">"مشكلة في الاتصال."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"نقل رسالة"</item>
+    <item quantity="other" msgid="5083310421670206821">"نقل رسائل"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"‏النقل غير معتمد مع حسابات POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"تعذر النقل نظرًا لاحتواء التحديد على عدة حسابات."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"لا يمكن نقل الرسائل الموجودة في المسودات والبريد الصادر والبريد المرسل."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"البريد الوارد"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"البريد الصادر"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"المسودات"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"البريد غير المهم"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"مميّزة بنجمة"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"غير مقروءة"</string>
-    <string name="debug_title" msgid="1337476992195531309">"تصحيح الأخطاء"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"صندوق البريد"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"مميّزة بنجمة"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"المسودات"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"البريد الصادر"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"تعذر تنزيل المرفق."</string>
     <string name="message_decode_error" msgid="91396461771444300">"حدث خطأ أثناء فك ترميز الرسالة."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"تتعذر إعادة توجيه واحد أو أكثر من المرفقات."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"لم تتم إعادة توجيه المرفق"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"لم يتم تسجيل <xliff:g id="ACCOUNT_NAME">%s</xliff:g> بنجاح."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"تعذر تسجيل الدخول"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بايت"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بايت"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> كيلوبايت"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> كيلوبايت"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> ميغابايت"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> ميغابايت"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> غيغابايت"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> غيغابايت"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"إعداد الحساب"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"طلب التفويض"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"تسجيل الدخول"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"اكتب عنوان بريد إلكتروني وكلمة مرور صالحين."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"حساب متكرر"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"إنك تستخدم اسم المستخدم هذا للحساب \"<xliff:g id="DUPLICATE">%s</xliff:g>\" فعلاً."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"تبدأ كلمة المرور هذه وتنتهي بحرف مسافة واحد أو أكثر. لا تتوافق العديد من الخوادم مع كلمات المرور التي تحتوي على مسافات."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"جارٍ استرداد معلومات الحساب…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"جارٍ التحقق من إعدادات الخادم…"</string>
     <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_names_title" msgid="8780121351085082269">"إعداد الحساب"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"لا يمكن أن يكون هذا الحقل فارغًا."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"إعداد الحساب"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"نوع الحساب"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"ما نوع هذا الحساب؟"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"إعداد الحساب"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"إعدادات خادم البريد الوارد"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"اسم المستخدم"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"كلمة المرور"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"إعداد الحساب"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"إعدادات خادم البريد الصادر"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"‏خادم SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"المنفذ"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"نوع الأمان"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"طلب تسجيل الدخول"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"اسم المستخدم"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"كلمة المرور"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"شهادة العميل"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"تحديد"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"استخدام شهادة العميل"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"إزالة"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"بلا"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"معرّف جهاز الجوّال"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"إعدادات الحساب"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"أخفق تسجيل الدخول.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"التحكم عن بعد في إدارة الأمان"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"لا يمكنك تغيير اسم المستخدم لأحد الحسابات. لإضافة حساب باسم مستخدم مختلف، المس \"إضافة حساب\"."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"تحذير: سيؤدي إلغاء تنشيط صلاحية تطبيق البريد الإلكتروني لإدارة الجهاز إلى حذف جميع حسابات البريد الإلكتروني التي تتطلب الصلاحية، وأيضًا حذف البريد الإلكتروني وجهات الاتصال وأحداث التقويم وغيرها من البيانات."</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>
@@ -168,6 +207,9 @@
     <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_login_dialog_title" msgid="2250911725501042470">"تعذر تسجيل الدخول"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"اسم المستخدم أو كلمة المرور للحساب <xliff:g id="ACCOUNT">%s</xliff:g> غير صحيح؟. هل تريد تحديثهما الآن؟"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"أخفق تسجيل دخولك إلى <xliff:g id="ACCOUNT">%s</xliff:g> ؛ رسالة الخادم: <xliff:g id="REASON">%s</xliff:g> هل تريد تحديث اسم المستخدم وكلمة المرور؟"</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>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"مزامنة حدث التقويم لهذا الحساب"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"مزامنة البريد الإلكتروني"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"مزامنة البريد الإلكتروني لهذا الحساب"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"اهتزاز"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"اهتزاز"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"اختيار نغمة الرنين"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"إعدادات الخادم"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"خيارات المزامنة"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"مزامنة هذا المجلد"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"تنزيل الرسائل عند الاتصال"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"أيام مزامنة البريد"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"صورة المرسل"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"‏تتضمن بعض حسابات \"Plus\" الوصول عبر بروتوكول POP والذي يسمح لهذا البرنامج بالاتصال. إذا تعذر عليك تسجيل الدخول باستخدام عنوان البريد الإلكتروني وكلمة المرور الصحيحين، فقد تكون غير ممتلك لحساب \"Plus\" مدفوع. يمكنك تشغيل متصفح الويب لتتمكن من الدخول إلى حسابات البريد هذه."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"‏قبل إعداد حساب البريد الإلكتروني هذا، انتقل إلى موقع ويب T-Online وأنشئ كلمة مرور للدخول إلى البريد الإلكتروني عبر بروتوكول POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"الشركة"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"تعذر إنشاء الحساب. أعد المحاولة."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"بريد إلكتروني"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"لتمكين سياسات الأمان الخاصة بالخادم"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"الإعدادات"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"الإعدادات العامة"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"تأكيد قبل الحذف"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"تأكيد قبل الإرسال"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"+999"</string>
+    <string name="search_hint" msgid="3491349343647799436">"البحث في البريد الإلكتروني"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"عدم السماح لاستخدام كاميرا الجهاز"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"يلزم كلمة مرور الجهاز"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"تقييد إعادة استخدام كلمات المرور الأخيرة"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"يبدو جيدًا بالنسبة إليّ!"</string>
     <string name="quick_3" msgid="8070999183033184986">"سأقرأ هذا لاحقًا، وسأرد عليك."</string>
     <string name="quick_4" msgid="216066940197616025">"دعونا نعد اجتماعًا لمناقشة هذا الأمر."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"تم تعطيل المزامنة في الخلفية لهذا الحساب أثناء التجوال."</string>
     <string name="confirm_response" msgid="6764021931370809514">"جارٍ إرسال الرد..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"‏(IMAP) الشخصي"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"‏(POP3) الشخصي"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"ليست هناك أية رسائل."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"منتقي المجلد"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"حدد مجلد المهملات التابع للخادم لـ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"حدد مجلد العناصر المرسلة من الخادم لـ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <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>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 9e6a8f7..87bf694 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Достъп до данни на доставчика на имейл"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Дава на приложението достъп до базата от данни на имейла ви, включително получени и изпратени съобщения, потребителски имена и пароли."</string>
     <string name="app_name" msgid="2206468539066258195">"Електронна поща"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Отстраняване на грешки"</string>
     <string name="create_action" msgid="6575946089819721958">"Създаване на нов"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Няма бързи отговори."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Настройки на профила"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Проблем с връзката."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Преместване на съобщение"</item>
+    <item quantity="other" msgid="5083310421670206821">"Преместване на съобщения"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Преместването не се поддържа за профили с POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Не може да се премести, защото изборът съдържа няколко профила."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Съобщенията в „Чернови“, „Изх. поща“ и „Изпратени“ не могат да се местят."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Вх. поща"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Изх. поща"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Чернови"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Нежелана поща"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Със звезда"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Непрочетени"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Отстраняване на грешки"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Вх. поща"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Със звезда"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Чернови"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Изх. поща"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Прикаченият файл не можа да бъде изтеглен."</string>
     <string name="message_decode_error" msgid="91396461771444300">"При декодирането на съобщението възникна грешка."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Един или повече прикачени файла не можаха да се препратят."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Прикаченото не бе препратено"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Не успяхте да влезете в профила си <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Не можах да вляза в профила си"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>  Б"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> КБ"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> КБ"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> МБ"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> МБ"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ГБ"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ГБ"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Настройка на профила"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Заявява се удостоверяване"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Влезте"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Въведете валиден имейл адрес и парола."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Дублиращ профил"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Вече използвате това потребителско име за профила „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Тази парола започва или завършва с един или повече знака за интервал. Много сървъри не поддържат пароли с интервали."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Извлича се информация за профила..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Настройките на сървъра се потвърждават…"</string>
     <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_names_title" msgid="8780121351085082269">"Настройка на профила"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Това поле трябва да се попълни."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Настройка на профила"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Тип профил"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Какъв вид профил е това?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Настройка на профила"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Настройки на вх. сървър"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ПОТРЕБИТЕЛСКО ИМЕ"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ПАРОЛА"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Настройка на профила"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Настройки на изходящия сървър"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP СЪРВЪР"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ПОРТ"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ТИП СИГУРНОСТ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Изисква влизане в профил"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ПОТРЕБИТЕЛСКО ИМЕ"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ПАРОЛА"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"СЕРТИФИКАТ ЗА КЛИЕНТСКА ПРОГРАМА"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Изберете"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Със сертификат за клиентска прогр."</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Премахване"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Няма"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ИДЕНТ. № НА МОБИЛНОТО У-ВО"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Настройки на профила"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"Влизането не бе успешно.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Отдалечено администриране на сигурността"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"Не можете да промените потребителското име на профил. За да добавите такъв с ново име, докоснете „Добавяне на профил“."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ПРЕДУПРЕЖДЕНИЕ: Деактивирането на възможността приложението Имейл да администрира устройството ви ще изтрие всички имейл адреси, които го изискват, заедно с имейлите, контактите, събитията от календара и други данни в тях."</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>
@@ -168,6 +207,9 @@
     <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_login_dialog_title" msgid="2250911725501042470">"Не можах да вляза в профила си"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Неправилно потребителско име или парола за <xliff:g id="ACCOUNT">%s</xliff:g>. Искате ли да ги актуализирате сега?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Влизането ви в/ъв <xliff:g id="ACCOUNT">%s</xliff:g> не бе успешно, сървърът отговори със: <xliff:g id="REASON">%s</xliff:g> Искате ли да актуализирате своето потребителско име и/или парола?"</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>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Синхр. на календарно събитие за профила"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Синхрон на имейлите"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Синхрон на имейлите за този профил"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Вибриране"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Вибриране"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Избор на мелодия"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Настройки на сървъра"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Опции за синхронизиране"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Синхронизиране на тази папка"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Съобщенията ще бъдат изтеглени при наличие на връзка"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Дни от пощата за синхронизиране"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Изображение на подателя"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Само някои „Plus“ профили включват достъп чрез POP, позволявайки на тази програма да се свърже. Ако не можете да влезете с правилния си имейл адрес и парола, може да не сте платили за такъв профил. Моля, стартирайте уеб браузъра, за да получите достъп до тези имейл адреси."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Преди да настроите този имейл адрес, посетете уебсайта на T-Online и създайте парола за достъп до имейл чрез POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Фирмен"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Профилът не можа да бъде създаден. Опитайте отново."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Електронна поща"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Активира определени от сървъра защитни правила"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Настройки"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Общи настройки"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Потвърждаване преди изтриване"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Потвърждаване преди изпращане"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Търсете по имейл"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Забраняване на използването на камерата"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Изискване на парола за устройството"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Без повторно ползване на скорошни пароли"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Звучи добре!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Ще прочета това по-късно и ще се свържа с Вас."</string>
     <string name="quick_4" msgid="216066940197616025">"Нека да насрочим среща, за да обсъдим това."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Синхронизирането на заден план за този профил е деактивирано при роуминг."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Отговорът се изпраща…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Личен (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Личен (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Няма съобщения."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Инструмент за избор на папки"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Изберете папка „Кошче“ на сървъра за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Изберете папка за изпр. елементи на сървъра за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <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>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
deleted file mode 100644
index 6d948e1..0000000
--- a/res/values-bn-rBD/strings.xml
+++ /dev/null
@@ -1,296 +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">"ইমেল সংযুক্তিগুলি পড়ুন"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"অ্যাপ্লিকেশানটিকে আপনার ইমেল সংযুক্তিগুলি পড়ার অনুমতি দেয়।"</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"ইমেল প্রদানকারীর ডেটা অ্যাক্সেস করুন"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"অ্যাপ্লিকেশানটিকে প্রাপ্ত বার্তা, পাঠানো বার্তা, ব্যবহারকারীর নাম, এবং পাসওয়ার্ডগুলি সহ আপনার ইমেল ডেটাবেস অ্যাক্সেস করার অনুমতি দেয়।"</string>
-    <string name="app_name" msgid="2206468539066258195">"ইমেল"</string>
-    <string name="debug_title" msgid="1337476992195531309">"ডিবাগ"</string>
-    <string name="create_action" msgid="6575946089819721958">"নতুন তৈরি করুন"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"কোনো দ্রুত প্রতিক্রিয়া নেই।"</string>
-    <string name="account_settings_action" msgid="589969653965674604">"অ্যাকাউন্ট সেটিংস"</string>
-    <string name="status_network_error" msgid="526826323872477973">"সংযোগ সমস্যা৷"</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"বার্তা সরান"</item>
-    <item quantity="other" msgid="5083310421670206821">"বার্তাগুলি সরান"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 অ্যাকাউন্টগুলিতে সরানো সমর্থিত নয়।"</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"নির্বাচনে একাধিক অ্যাকাউন্ট থাকার কারণে সরানো যাবে না।"</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"খসড়াগুলিতে, আউটবক্সে, এবং প্রেরিততে থাকা বার্তাগুলি সরানো যাবে না।"</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"ইনবক্স"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"আউটবক্স"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"খসড়াগুলি"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"ট্র্যাশ"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"প্রেরিত"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"জাঙ্ক"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"তারকা চিহ্নিত"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"অপঠিত"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"ইনবক্স"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"তারকা চিহ্নিত"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"খসড়াগুলি"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"আউটবক্স"</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>\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>
-    <string name="attachment_not_found" msgid="5219773045406833000">"সংযুক্তিটি ডাউনলোড করা যায়নি।"</string>
-    <string name="message_decode_error" msgid="91396461771444300">"বার্তাটি ডিকোড করার সময় একটি ত্রুটি হয়েছে।"</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"এক বা একাধিক সংযুক্তি ফরোয়ার্ড করা যায়নি।"</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"সংযুক্তি ফরোয়ার্ড করা হয়নি"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> সাইন ইন অসফল।"</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"সাইন ইন করা যায়নি"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"অ্যাকাউন্ট সেটআপ"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"অনুমোদনের অনুরোধ জানানো হচ্ছে"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"সাইন ইন করুন"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"প্রমাণীকরণ করা যাবে না"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"ইমেল ঠিকানা বা পাসওয়ার্ড ভুল"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"ইমেল ঠিকানা:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"ইমেল অ্যাকাউন্ট"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"আপনি মাত্র কয়েকটি ধাপে আপনার অ্যাকাউন্ট সেট আপ করতে পারবেন।"</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"ইমেল ঠিকানা"</string>
-    <string name="or_label" msgid="6408695162723653446">"অথবা"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google এর মাধ্যমে সাইন ইন করুন"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"পাসওয়ার্ড"</string>
-    <string name="password_hint" msgid="4226682910292828279">"পাসওয়ার্ড"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s দিয়ে সাইন ইন করা হয়েছে"</string>
-    <string name="authentication_label" msgid="914463525214987772">"প্রমাণীকরণ"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"প্রমাণীকরণ জুড়ুন"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"প্রমাণীকরণ সাফ করুন"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"ম্যানুয়াল সেটআপ"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"একটি বৈধ ইমেল ঠিকানা ও পাসওয়ার্ড লিখুন।"</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"অনুরূপ অ্যাকাউন্ট"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"আপনি \"<xliff:g id="DUPLICATE">%s</xliff:g>\" অ্যাকাউন্টের জন্য এই ব্যবহারকারী নামটি ইতিমধ্যেই ব্যবহার করছেন।"</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"এই পাসওয়ার্ডটির শুরুতে বা শেষে এক বা একাধিক স্পেস রয়েছে। অনেক সার্ভার পাসওয়ার্ড স্পেস থাকলে তা সমর্থন করে না।"</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"অ্যাকাউন্ট তথ্য পুনরুদ্ধার হচ্ছে…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"সার্ভার সেটিংস যাচাই হচ্ছে…"</string>
-    <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_names_title" msgid="8780121351085082269">"অ্যাকাউন্ট সেটআপ"</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>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"এই ক্ষেত্রটি ফাঁকা রাখা যাবে না।"</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"অ্যাকাউন্ট সেটআপ"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"অ্যাকাউন্টের প্রকার"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"এটি কেমন ধরণের অ্যাকাউন্ট?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"অ্যাকাউন্ট সেটআপ"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"ইনকামিং সার্ভার সেটিংস"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ব্যবহারকারীর নাম"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"পাসওয়ার্ড"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"পাসওয়ার্ড"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"সার্ভার"</string>
-    <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_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>
-    <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_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>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"অ্যাকাউন্ট সেটআপ"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"আউটগোয়িং সার্ভার সেটিংস"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP সার্ভার"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"পোর্ট"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"নিরাপত্তার ধরন"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"সাইন ইন করতে হবে"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ব্যবহারকারীর নাম"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"পাসওয়ার্ড"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"ক্লায়েন্ট শংসাপত্র"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"নির্বাচন করুন"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"ক্লায়েন্ট শংসাপত্র ব্যবহার করুন"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"সরান"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"কোনো কিছুই নয়"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"মোবাইল ডিভাইস আইডি"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"অ্যাকাউন্ট সেটিংস"</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_push" msgid="5511415696925307797">"স্বয়ংক্রিয় (পুশ)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="8929785860545198867">"প্রতি ৫ মিনিটে"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="8787901333816702849">"প্রতি ১০ মিনিটে"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"প্রতি ১৫ মিনিটে"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"প্রতি ৩০ মিনিটে"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"প্রত্যেক ঘন্টায়"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"ইমেল এলে আমাকে বিজ্ঞপ্তি পাঠান"</string>
-    <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">"যখন 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>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"গত দিন"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"গত তিন দিনের"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"গত সপ্তাহের"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"গত দুই সপ্তাহের"</string>
-    <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_fmt" msgid="8811464534757505457">"লগইন ব্যর্থ হয়েছে।\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"সার্ভারে নিরাপদে সংযোগ করা যাচ্ছে না।\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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_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>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"সার্ভারে সংযোগ করা যায়নি।"</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"আপনি সার্ভার ঠিকানাটি ভুল লিখেছেন অথবা সার্ভারটির একটি এমন প্রোটোকল সংস্করণ প্রয়োজন যা ইমেল সমর্থন করে না।"</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"আপনার কাছে এই সার্ভারের সাথে সিঙ্ক করার অনুমতি নেই। আরো তথ্যের জন্য আপনার সার্ভারের প্রশাসকের সাথে যোগাযোগ করুন।"</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"দূরবর্তী নিরাপত্তা প্রশাসন"</string>
-    <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"আপনি কোনো অ্যাকাউন্টের ব্যবহারকারী নাম পরিবর্তন করতে পারবেন না। একটি ভিন্ন ব্যবহারকারী নামের কোনো অ্যাকাউন্ট জোড়ার জন্য, অ্যাকাউন্ট জুড়ুন স্পর্শ করুন।"</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"সতর্কতা: আপনার ডিভাইস পরিচালনার জন্য ইমেল অ্যাপ্লিকেশনের কর্তৃত্ব নিষ্ক্রিয় করা হলে যেসব ইমেল অ্যাকাউন্টের এটি প্রয়োজন সেগুলি, এবং তার পাশাপাশি সেগুলির ইমেল, পরিচিতি, ক্যালেন্ডার ইভেন্ট, এবং অন্যান্য ডেটা মুছে যাবে।"</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_change_title" msgid="615639963487448183">"নিরাপত্তা নীতিগুলি পরিবর্তিত হয়েছে"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"নিরাপত্তা নীতিগুলি পূরণ করা যাবে না"</string>
-    <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>\" এর জন্য আপনার লক স্ক্রিনের PIN বা পাসওয়ার্ড পরিবর্তন করা প্রয়োজন।"</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"লক স্ক্রিন পাসওয়ার্ডের মেয়াদ শেষ হচ্ছে"</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">"খুব শীঘ্রই আপনার লক স্ক্রিনের 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> এর ডেটা মুছে ফেলা হচ্ছে। আপনি আপনার লক স্ক্রিন PIN অথবা পাসওয়ার্ড পরিবর্তন করে এটিকে পুনরুদ্ধার করতে পারেন। এটি এখনই পরিবর্তন করবেন?"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"অসংরক্ষিত পরিবর্তনগুলি পরিত্যাগ করবেন?"</string>
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"সাইন ইন করা যায়নি"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> এর জন্য ব্যবহারকারী নাম বা পাসওয়ার্ডটি ভুল। আপনি কি এখন সেগুলিকে আপডেট করতে চান?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"<xliff:g id="ACCOUNT">%s</xliff:g> এ আপনার লগইন ব্যর্থ হয়েছে; সার্ভার জানিয়েছে: <xliff:g id="REASON">%s</xliff:g> আপনি কি আপনার ব্যবহারকারী নাম এবং/অথবা পাসওয়ার্ড আপডেট করতে চান?"</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>
-    <string name="account_settings_summary" msgid="4733776978291376161">"সিঙ্ক হওয়ার হার, বিজ্ঞপ্তিগুলি, ইত্যাদি।"</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"ইমেল এলে বিজ্ঞপ্তি পাঠান"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"সিঙ্ক করার হার"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"ইনকামিং সেটিংস"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"ব্যবহারকারী নাম, পাসওয়ার্ড, ও অন্যান্য ইনকামিং সার্ভার সেটিংস"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"আউটগোয়িং সেটিংস"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"ব্যবহারকারী নাম, পাসওয়ার্ড, ও অন্যান্য আউটগোয়িং সার্ভার সেটিংস"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"প্রয়োগ করা নীতিগুলি"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"কোনো কিছুই নয়"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"অসমর্থিত নীতিগুলি"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"কোনো কিছুই নয়"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"সিঙ্কের প্রয়াস করুন"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"এই অ্যাকাউন্টটি সিঙ্ক করতে এখানে স্পর্শ করুন"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"অ্যাকাউন্টের নাম"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"আপনার নাম"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"দ্রুত প্রতিক্রিয়াগুলি"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"ইমেল লেখার সময় আপনি ঘন ঘন যে পাঠ্য সন্নিবেশ করেন সেটিকে সম্পাদনা করুন"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"বিজ্ঞপ্তি সেটিংস"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"ডেটার ব্যবহার"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"নিরাপত্তা নীতিগুলি"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"সিস্টেম ফোল্ডারগুলি"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"ট্র্যাশ ফোল্ডার"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"আপনার সার্ভারের ট্র্যাশ ফোল্ডার নির্বাচন করুন"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"আপনার সার্ভারের ট্র্যাশ ফোল্ডার নির্বাচন করুন"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"পাঠানো আইটেমগুলির ফোল্ডার"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"আপনার সার্ভারের প্রেরিত আইটেম ফোল্ডার নির্বাচন করুন"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"আপনার সার্ভারের পাঠানো আইটেমগুলির ফোল্ডার নির্বাচন করুন"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"দ্রুত প্রতিক্রিয়া"</string>
-    <string name="save_action" msgid="5740359453077441466">"সংরক্ষণ করুন"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"পরিচিতিগুলি সিঙ্ক"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"এই অ্যাকাউন্টের জন্য পরিচিতি সিঙ্ক"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"ক্যালেন্ডার সিঙ্ক"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"এই অ্যাকাউন্টের জন্য ক্যালেন্ডার ইভেন্ট সিঙ্ক"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ইমেল সিঙ্ক করুন"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"এই অ্যাকাউন্টের জন্য ইমেল সিঙ্ক"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"কম্পন"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"রিংটোন চয়ন করুন"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"সার্ভার সেটিংস"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"সিঙ্কের বিকল্পগুলি"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"সিঙ্কের বিকল্পগুলি (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"এই ফোল্ডারটি সিঙ্ক করুন"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"সংযুক্ত হলে বার্তাগুলি ডাউনলোড হবে"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"এত দিনের মেল সিঙ্ক করা হবে"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"প্রেরকের চিত্র"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"শুধুমাত্র POP অ্যাক্সেস সহ কিছু \"Plus\" অ্যাকাউন্ট এই প্রোগ্রামের সাথে সংযোগ করার অনুমতি দিচ্ছে। আপনি যদি আপনার সঠিক ইমেল ঠিকানা এবং পাসওয়ার্ড দিয়ে সাইন ইন করতে সক্ষম না হন তাহলে আপনার কাছে সম্ভবত কোনো অর্থ প্রদান করে পাওয়া \"Plus\" অ্যাকাউন্ট নেই। এই ইমেল অ্যাকাউন্টগুলিতে অ্যাক্সেস পেতে ওয়েব ব্রাউজার চালু করুন।"</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"এই ইমেল অ্যাকাউন্টটি সেট আপ করার আগে, T-Online ওয়েবসাইটে যান এবং POP3 ইমেল অ্যাক্সেসের জন্য একটি পাসওয়ার্ড তৈরি করুন।"</string>
-    <string name="exchange_name" msgid="3793803477985438102">"কর্পোরেট"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"অ্যাকাউন্ট তৈরি করা যায়নি। আবার চেষ্টা করুন।"</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"ইমেল"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"সার্ভার-নির্দিষ্ট নিরাপত্তা নীতিগুলি সক্ষম করে"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"সেটিংস"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"সাধারণ সেটিংস"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"মোছার আগে নিশ্চিত করুন"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"পাঠানোর আগে নিশ্চিত করুন"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"ইমেল অনুসন্ধান করুন"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"ডিভাইসের ক্যামেরা ব্যবহারের অনুমতি দেবেন না"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"ডিভাইস পাসওয়ার্ড প্রয়োজন"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"সাম্প্রতিক পাসওয়ার্ডগুলির পুনঃব্যবহার সীমাবদ্ধ করুন"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"পাসওয়ার্ডের মেয়াদ ফুরানো প্রয়োজন"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"স্ক্রিন লক হওয়ার পূর্বে ডিভাইস নিষ্ক্রিয় হতে হবে"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"সিঙ্ক হওয়া ক্যালেন্ডার ইভেন্টগুলির সংখ্যা সীমিত করুন"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"ইমেল সিঙ্ক হওয়ার সংখ্যা সীমিত করুন"</string>
-    <string name="quick_1" msgid="9130521670178673190">"ধন্যবাদ!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"আমার কাছে অর্থপূর্ণ বলেই মনে হচ্ছে!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"আমি এটি পরে পড়ব এবং আপনার সাথে যোগাযোগ করব।"</string>
-    <string name="quick_4" msgid="216066940197616025">"এটি নিয়ে আলোচনা করার জন্য একটি মিটিঙের আয়োজন করা যাক।"</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"রোমিংয়ে থাকার সময় এই অ্যাকাউন্টের জন্য পটভূমি সিঙ্ক অক্ষম করা থাকে।"</string>
-    <string name="confirm_response" msgid="6764021931370809514">"প্রতিক্রিয়া পাঠানো হচ্ছে..."</string>
-    <string name="no_conversations" msgid="3785854971159919343">"কোনো বার্তা নেই৷"</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"ফোল্ডার চয়নকারী"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> এর সার্ভারের ট্র্যাশ ফোল্ডার নির্বাচন করুন"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> এর জন্য সার্ভারের প্রেরিত আইটেম ফোল্ডার নির্বাচন করুন"</string>
-    <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>
-</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 110295d..b33724e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Accedeix a les dades del proveïdor de correu electrònic"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Permet que l\'aplicació accedeixi a la base de dades del teu correu electrònic, inclosos els missatges rebuts, els missatges enviats, els noms d\'usuari i les contrasenyes."</string>
     <string name="app_name" msgid="2206468539066258195">"Correu"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Depuració"</string>
     <string name="create_action" msgid="6575946089819721958">"Crea"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"No hi ha respostes ràpides."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Configuració del compte"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Problema de connexió."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Mou el missatge"</item>
+    <item quantity="other" msgid="5083310421670206821">"Mou els missatges"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Els comptes POP3 no admeten el desplaçament d\'elements."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"No es pot moure perquè la selecció conté diversos comptes."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Els missatges de les carpetes Esborranys, Bústia de sortida i Enviats no es poden moure."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Safata d\'entrada"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Bústia de sortida"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Esborranys"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Correu brossa"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Destacats"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"No llegit"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Depuració"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Safata d\'entrada"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Destacats"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Esborranys"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Bústia de sortida"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Visualització combinada"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Missatge original --------\nAssumpte: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe: <xliff:g id="SENDER">%2$s</xliff:g>\nPer a: <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">"Inserció d\'una resposta ràpida"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Insereix resposta ràpida"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Nota: Un o més fitxers adjunts del teu missatge reenviat es baixaran abans de l\'enviament."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"No s\'ha pogut baixar el fitxer adjunt."</string>
     <string name="message_decode_error" msgid="91396461771444300">"S\'ha produït un error en descodificar el missatge."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"No s\'han pogut reenviar un o més fitxers adjunts."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"El fitxer adjunt no s\'ha reenviat"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Error en l\'inici de sessió a <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"No s\'ha pogut iniciar la sessió"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Configuració del compte"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Sol·licitud d\'autorització"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Inici de sessió"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Escriu una adreça electrònica i una contrasenya vàlides."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Compte duplicat"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Ja estàs fent servir aquest nom d\'usuari per al compte \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Aquesta contrasenya comença o acaba amb un o més espais en blanc. Molts servidors no admeten les contrasenyes amb espais."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"S\'està recuperant la informació del compte..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"S\'està validant la configuració del servidor…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"S\'està validant la configuració de smtp…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"S\'està creant el compte..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Confirmació del tipus de compte"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Has indicat que <xliff:g id="EMAIL">%1$s</xliff:g> utilitza <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, però és possible que el compte utilitzi <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Configuració del compte"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"El compte ja s\'ha configurat i aviat rebràs el correu."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Assigna un nom a aquest compte (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"El teu nom (als missatges enviats)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Aquest camp no pot estar en blanc."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Configuració del compte"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Tipus de compte"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Quin tipus de compte és?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Configuració del compte"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Configuració del servidor d\'entrada"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NOM D\'USUARI"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"CONTRASENYA"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"En suprimir missatges"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Prefix de camí IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Opcional"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Configuració del compte"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Configuració del servidor de sortida"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVIDOR SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TIPUS DE SEGURETAT"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Requereix l\'inici de sessió"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NOM D\'USUARI"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"CONTRASENYA"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFICAT DE CLIENT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Selecciona"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Utilitza un certificat de client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Elimina"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Cap"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID DE DISPOSITIU MÒBIL"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Configuració del compte"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Opcions del compte"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Freqüència de sincronització:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Mai"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Tots"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Utilitza opcions predeterminades del compte"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"El nom d\'usuari o la contrasenya no són correctes."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"S\'ha produït un error en iniciar la sessió.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problema amb la configuració del compte"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Confirma que la configuració del nom d\'usuari, de la contrasenya i del compte siguin correctes."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"No es pot establir una connexió segura amb el servidor."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Administració de seguretat remota"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"És necessari que permetis que el servidor <xliff:g id="SERVER">%s</xliff:g> controli de manera remota algunes funcions de seguretat del dispositiu Android. Vols acabar de configurar aquest compte?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"El servidor requereix funcions de seguretat que no són compatibles amb el teu dispositiu Android i que inclouen: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"No pots canviar el nom d\'usuari d\'un compte. Per afegir un compte amb un nom d\'usuari diferent, toca Afegeix un compte."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ADVERTIMENT: Desactivar l\'autoritat de l\'aplicació de correu electrònic per administrar el dispositiu suprimirà tots els comptes de correu electrònic que ho requereixin, juntament amb els correus electrònics, els contactes, els esdeveniments de calendari i altres dades."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Actualització de seguretat"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> necessita que actualitzis la configuració de seguretat."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"La contrasenya de bloqueig de pantalla ha caducat"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Les dades de <xliff:g id="ACCOUNT">%s</xliff:g> s\'estan esborrant del dispositiu. Pots restaurar-les si canvies la contrasenya o el PIN de bloqueig de pantalla. Vols fer el canvi ara?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Vols descartar els canvis no desats?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"No s\'ha pogut iniciar la sessió"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"El nom d\'usuari o la contrasenya de <xliff:g id="ACCOUNT">%s</xliff:g> no són correctes. Vols actualitzar-los ara?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"S\'ha produït un error en iniciar la sessió a <xliff:g id="ACCOUNT">%s</xliff:g>. El servidor ha dit: <xliff:g id="REASON">%s</xliff:g> Vols actualitzar el teu nom d\'usuari o la contrasenya?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Baixa fitxers adjunts"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Baixa automàticament fitxers adjunts de missatges recents per Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Notificacions de correu"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sincronitza els esdeveniments del calendari del compte"</string>
     <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="label_notification_vibrate_title" msgid="361069844540266098">"Vibra"</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>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sincronitza aquesta carpeta"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Els missatges es baixaran quan estiguis connectat"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Dies per sincronitzar correu"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Imatge del remitent"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Només alguns comptes \"Plus\" inclouen l\'accés POP que permet que aquest programa s\'hi connecti. Si no pots iniciar la sessió amb l\'adreça electrònica i la contrasenya correctes, pot ser que no tinguis un compte \"Plus\" de pagament. Inicia el navegador web per accedir a aquests comptes de correu."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Abans de configurar aquest compte de correu electrònic, visita el lloc web de T-Online i crea una contrasenya per a l\'accés al correu electrònic POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Corporatiu"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"No s\'ha pogut crear el compte. Torna-ho a provar."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Correu electrònic"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Permet les polítiques de seguretat especificades pel servidor"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Configuració"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Configuració general"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Confirma abans de suprimir"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Confirma abans d\'enviar"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Cerca al correu electrònic"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"No permetis l\'ús de la càmera del dispositiu"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Requereix la contrasenya del dispositiu"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Restringeix la reutilització de contrasenyes recents"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Em sembla molt bé."</string>
     <string name="quick_3" msgid="8070999183033184986">"Ho llegiré més tard i et respondré."</string>
     <string name="quick_4" msgid="216066940197616025">"Organitzem una reunió per parlar-ne."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"La sincronització en segon pla d\'aquest compte s\'ha desactivat en itinerància."</string>
     <string name="confirm_response" msgid="6764021931370809514">"S\'està enviant la resposta..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personal (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personal (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"No hi ha missatges."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Selector de carpeta"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Selecciona la carpeta de la paperera del servidor per a: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Selecciona la carpeta d\'elements enviats del servidor per a: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"S\'està carregant la llista de carpetes..."</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"No n\'hi ha cap de disponible"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Configuració de la sincronització de carpetes"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 891919d..d529a75 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Přístup k datům poskytovatele e-mailu"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Povoluje aplikaci přístup do databáze e-mailů, a to včetně přijatých a odeslaných zpráv, uživatelských jmen a hesel."</string>
     <string name="app_name" msgid="2206468539066258195">"E-mail"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Ladit"</string>
     <string name="create_action" msgid="6575946089819721958">"Vytvořit novou"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Žádné rychlé odpovědi."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Nastavení účtu"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Problém s připojením."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Přesunout zprávu"</item>
+    <item quantity="other" msgid="5083310421670206821">"Přesunout zprávy"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Účty POP3 přesun nepodporují."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Přesun nelze uskutečnit, protože vybrané zprávy pocházejí z různých účtů."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Zprávy ve složkách Koncepty, Pošta k odeslání a Odeslané nelze přesouvat."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Doručená pošta"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Pošta k odeslání"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Koncepty"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Nevyžádaná pošta"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"S hvězdičkou"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Nepřečtené"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Ladit"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Doručená pošta"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Označené hvězdičkou"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Koncepty"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Pošta k odeslání"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Kombinované zobrazení"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Původní zpráva --------\nPředmět: <xliff:g id="SUBJECT">%1$s</xliff:g>\nOd: <xliff:g id="SENDER">%2$s</xliff:g>\nKomu: <xliff:g id="TO">%3$s</xliff:g>\nKopie: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Původní zpráva --------\nPředmět: <xliff:g id="SUBJECT">%1$s</xliff:g>\nOdesílatel: <xliff:g id="SENDER">%2$s</xliff:g>\nKomu: <xliff:g id="TO">%3$s</xliff:g>\nKopie: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Vložit rychlou odpověď"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Vložit rychlou odpověď"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Jedna či více příloh v přeposílané zprávě bude před odesláním stažena."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Přílohu nelze stáhnout."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Při dekódování zprávy došlo k chybě."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Nepodařilo se přeposlat jednu nebo více příloh."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Příloha nebyla přeposlána"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Přihlášení k účtu <xliff:g id="ACCOUNT_NAME">%s</xliff:g> se nezdařilo."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Přihlášení se nezdařilo"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Nastavení účtu"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Požadována autorizace"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Přihlásit se"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Zadejte platnou e-mailovou adresu a heslo."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Duplicitní účet"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Toto uživatelské jméno již používáte pro účet <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Toto heslo začíná nebo končí nejméně jednou mezerou. Většina serverů hesla s mezerami nepodporuje."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Načítání informací o účtu..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Ověřování nastavení serveru…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Ověřování nastavení serveru SMTP…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Vytváření účtu..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Potvrďte typ účtu"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Uvedli jste, že účet <xliff:g id="EMAIL">%1$s</xliff:g> používá protokol <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, je však možné, že používá protokol <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Nastavení účtu"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Váš účet je nastaven a e-mail je na cestě!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Pojmenovat tento účet (nepovinné)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Vaše jméno (zobr. na odchozích zprávách)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Toto pole nesmí být prázdné."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Nastavení účtu"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Typ účtu"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"O jaký typ účtu se jedná?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Nastavení účtu"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Nastavení serveru příchozí pošty"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"UŽIVATELSKÉ JMÉNO"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"HESLO"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Při smazání z Doručené pošty"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Předpona cesty IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Nepovinné"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Nastavení účtu"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Nastavení serveru odchozí pošty"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVER SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TYP ZABEZPEČENÍ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Vyžadovat přihlášení"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"UŽIVATELSKÉ JMÉNO"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"HESLO"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFIKÁT KLIENTA"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Vybrat"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Použít klientský certifikát"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Odebrat"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Žádný"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID MOBILNÍHO ZAŘÍZENÍ"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Nastavení účtu"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Možnosti účtu"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Frekvence synchronizace:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nikdy"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Vše"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Použít výchozí nastavení účtu"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Uživatelské jméno nebo heslo jsou nesprávné."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Přihlášení se nezdařilo.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problém s nastavením účtu"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Potvrďte, že uživatelské jméno, heslo a nastavení účtu jsou správné."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Nelze se bezpečně připojit k serveru."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Vzdálená správa zabezpečení"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Server <xliff:g id="SERVER">%s</xliff:g> žádá o povolení, aby mohl vzdáleně ovládat některé funkce zabezpečení v zařízení Android. Chcete dokončit nastavení tohoto účtu?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Server vyžaduje funkce zabezpečení, které toto zařízení Android nepodporuje, například: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Uživatelské jméno účtu nemůžete změnit. Chcete-li přidat účet s jiným uživatelským jménem, dotkněte se možnosti Přidat účet."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"UPOZORNĚNÍ: Deaktivujete-li oprávnění aplikace E-mail spravovat toto zařízení, budou smazány všechny účty aplikace E-mail, které toto oprávnění vyžadují. Společně s těmito účty budou smazány i všechny jejich e-maily, kontakty, události v kalendářích a další údaje."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Aktualizace zabezpečení"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> vyžaduje aktualizaci nastavení zabezpečení."</string>
@@ -168,9 +207,12 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Platnost hesla zámku obrazovky vypršela"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Ze zařízení jsou mazány údaje účtu <xliff:g id="ACCOUNT">%s</xliff:g>. Můžete je obnovit změnou kódu PIN nebo hesla pro uzamčení obrazovky. Chcete tuto změnu provést hned?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Zahodit neuložené změny?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Přihlášení se nezdařilo"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Uživatelské jméno nebo heslo k účtu <xliff:g id="ACCOUNT">%s</xliff:g> je nesprávné. Chcete je aktualizovat?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Připojení k účtu <xliff:g id="ACCOUNT">%s</xliff:g> se nezdařilo. Odpověď serveru: <xliff:g id="REASON">%s</xliff:g> Chcete aktualizovat své uživatelské jméno a heslo?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Stahovat přílohy"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Automaticky stahovat přílohy posledních zpráv pomocí sítě Wi-Fi"</string>
-    <string name="account_settings_notify_label" msgid="8621226576645167987">"Oznámení o e-mailech"</string>
+    <string name="account_settings_notify_label" msgid="8621226576645167987">"E-mailová upozornění"</string>
     <string name="account_settings_summary" msgid="4733776978291376161">"Frekvence synchronizace, oznámení apod."</string>
     <string name="account_settings_notify_summary" msgid="88560545461159120">"Zaslat oznámení, když přijde e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"Frekvence synchronizace"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synchronizovat události kalendáře pro tento účet"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synchronizovat e-maily"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synchronizovat e-maily pro tento účet"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrace"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrace"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Vybrat vyzvánění"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Nastavení serveru"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Možnosti synchronizace"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Synchronizovat tuto složku"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Zprávy se stáhnou, jakmile bude k dispozici připojení"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Počet dní k synchronizaci pošty"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Obrázek odesílatele"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Přístup POP, který umožňuje připojení pomocí tohoto programu, zahrnují pouze některé účty typu Plus. Pokud zadáváte správnou e-mailovou adresu a heslo, ale nemůžete se přihlásit, pravděpodobně nemáte placený účet Plus. K těmto e-mailovým účtům můžete přistupovat prostřednictvím webového prohlížeče."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Před nastavením tohoto e-mailového účtu navštivte stránky T-Online a vytvořte heslo pro přístup k e-mailu prostřednictvím protokolu POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Firemní"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Účet se nepodařilo vytvořit. Zkuste to znovu."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-mail"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Povoluje zásady zabezpečení určené serverem"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Nastavení"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Obecná nastavení"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Před smazáním potvrdit"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Před odesláním potvrdit"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Hledat v e-mailu"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Zakázat používání fotoaparátu v zařízení"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Požadovat heslo zařízení"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Omezit opětovné použití nedávných hesel"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"To zní dobře!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Přečtu si to později a ozvu se."</string>
     <string name="quick_4" msgid="216066940197616025">"Můžeme si dohodnout schůzku, abychom to prodiskutovali."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Synchronizace na pozadí je v tomto účtu při roamingu zakázána."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Odesílání odpovědi..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Osobní (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Osobní (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Žádné zprávy"</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Výběr složky"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Vyberte Koš serveru pro účet <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Vyberte složku odesl. položek <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Načítání seznamu složek…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Žádná není k dispozici"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Nastavení synchronizace složek"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f2962ef..3c4eeb9 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Få adgang til data om e-mailudbyder"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Tillader, at denne app kan få adgang til din e-maildatabase, f.eks. modtagne meddelelser, sendte meddelelser, brugernavne og adgangskoder."</string>
     <string name="app_name" msgid="2206468539066258195">"E-mail"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Fejlretning"</string>
     <string name="create_action" msgid="6575946089819721958">"Opret nyt"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Ingen hurtige svar."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Indstillinger for konto"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Forbindelsesproblem."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Flyt meddelelse"</item>
+    <item quantity="other" msgid="5083310421670206821">"Flyt meddelelser"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Flytning understøttes ikke for POP3-konti."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Kan ikke flyttes, fordi det valgte indeholder flere konti."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Meddelelser i Kladder, Udbakke og Sendte kan ikke flyttes."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Indbakke"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Udbakke"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Kladder"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Junk"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Stjernemarkerede"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Ulæste"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Fejlretning"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Indbakke"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Stjernemarkerede"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Kladder"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Udbakke"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Kombineret visning"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Oprindelig meddelelse --------\nEmne: <xliff:g id="SUBJECT">%1$s</xliff:g>\nFra: <xliff:g id="SENDER">%2$s</xliff:g>\nTil: <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">"Indsæt hurtigt svar"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Indsæt hurtigt svar"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"En eller flere vedhæftede filer i din videresendte meddelelse downloades før afsendelse."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Den vedhæftede fil kunne ikke downloades."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Der opstod en fejl under afkodning af meddelelsen."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"En eller flere vedhæftede filer kunne ikke videresendes."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Vedhæftet fil er ikke sendt"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> kunne ikke logge ind."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Login mislykkedes"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Gb"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Gb"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Konfiguration af konto"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Anmoder om tilladelse"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Log ind"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Indtast en gyldig e-mailadresse og adgangskode."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Dobbeltforekomst af konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Du bruger allerede dette brugernavn til kontoen \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Denne adgangskode starter eller slutter med ét eller flere mellemrum. Mange servere understøtter ikke adgangskoder med mellemrum."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Henter kontooplysninger ..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Godkender serverindstillinger..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Godkender SMTP-indstillinger..."</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Kontoen oprettes…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Bekræft kontotypen"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Du har angivet, at <xliff:g id="EMAIL">%1$s</xliff:g> bruger <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, men kontoen bruger muligvis <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Konfiguration af konto"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Din konto er konfigureret, og der er e-mail på vej."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Giv kontoen et navn (valgfrit)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Dit navn (vises på udgående meddelelser)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Dette felt må ikke være tomt."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Konfiguration af konto"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Kontotype"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Hvilken slags konto er dette?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Konfiguration af konto"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Indstillinger for indgående server"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"BRUGERNAVN"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ADGANGSKODE"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Når jeg sletter fra Indbakke"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Præfiks for IMAP-sti"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Valgfrit"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Konfiguration af konto"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Indstillinger for udgående server"</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">"SIKKERHEDSTYPE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Kræv login"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"BRUGERNAVN"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ADGANGSKODE"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"KLIENTCERTIFIKAT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Vælg"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Brug klientcertifikat"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Fjern"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Intet"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID FOR MOBILENHED"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Indstillinger for konto"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Valgmuligheder for konto"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Synkroniseringshyppighed:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Aldrig"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Alle"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Anvend kontostandard"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Brugernavn eller adgangskode er forkert."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Login mislykkedes.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problem med konfiguration af konto"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Du skal bekræfte, at brugernavn, adgangskode og kontoindstillinger er angivet korrekt."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Der kan ikke oprettes en sikker forbindelse til serveren."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Ekstern sikkerhedsadministration"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Serveren <xliff:g id="SERVER">%s</xliff:g> kræver, at du giver den tilladelse til eksternt at kontrollere nogle af Android-enhedens sikkerhedsfunktioner. Vil du afslutte konfigurationen af denne konto?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Denne server kræver sikkerhedsfunktioner, som din Android-enhed ikke understøtter, f.eks.: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Du kan ikke ændre brugernavnet på en konto. Hvis du vil tilføje en konto med et andet brugernavn, skal du trykke på Tilføj konto."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ADVARSEL! Hvis du deaktiverer appen E-mails tilladelse til at administrere din enhed, slettes alle konti i E-mail, der kræver dette, sammen med alle e-mails, kontaktpersoner, kalenderbegivenheder og andre data på disse konti."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Sikkerhedsopdatering"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> kræver, at du opdaterer dine sikkerhedsindstillinger."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Skærmlåskoden er udløbet"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Dataene for <xliff:g id="ACCOUNT">%s</xliff:g> er ved at blive slettet fra enheden. Du kan gendanne dem ved at ændre skærmlåsens pinkode eller adgangskode. Vil du ændre dette nu?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Vil du kassere ændringer, som ikke er gemt?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Login mislykkedes"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Brugernavn eller adgangskode for <xliff:g id="ACCOUNT">%s</xliff:g> er forkert. Vil du opdatere dem nu?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Dit login på <xliff:g id="ACCOUNT">%s</xliff:g> mislykkedes. Serveren sagde: <xliff:g id="REASON">%s</xliff:g> Vil du opdatere dit brugernavn og/eller din adgangskode?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Download vedhæftede filer"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Download autom. vedhæftede filer i nye meddelelser via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Underretninger om e-mails"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synkroniser begivenhed for konto"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synkroniser e-mails"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synkroniser e-mail for denne konto"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibration"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibration"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Vælg ringetone"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Serverindstillinger"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Indstillinger for synkronisering"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Synkroniser denne mappe"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Meddelelser downloades, når der er oprettet forbindelse"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Antal dages e-mail, der synkroniseres"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Afsenderbillede"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Det er kun nogle \"Plus\"-konti med POP-adgang, der tillader, at dette program opretter forbindelse. Hvis du ikke kan logge ind med din rigtige e-mailadresse og adgangskode, har du muligvis ikke en betalt \"Plus\"-konto. Åbn webbrowseren igen for at få adgang til disse e-mailkonti."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Inden du konfigurerer denne e-mailkonto, skal du gå til T-Onlines website og oprette en adgangskode for e-mailadgang via POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Exchange"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Kontoen kunne ikke oprettes. Prøv igen."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-mail"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Muliggør serverspecifikke sikkerhedspolitikker"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Indstillinger"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Generelle indstillinger"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Bekræft før sletning"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Bekræft før afsendelse"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Søg i e-mail"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Tillad ikke brug af enheden kamera"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Kræv adgangskode for enheden"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Begræns genbrug af seneste adgangskoder"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Det passer mig fint!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Jeg læser dette senere og vender tilbage til dig."</string>
     <string name="quick_4" msgid="216066940197616025">"Lad os holde et møde for at diskutere dette."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Baggrundssynkronisering for denne konto deaktiveres under roaming."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Sender svar..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personlig (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personlig (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Ingen meddelelser."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Mappevælger"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Vælg serverens papirkurv for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Vælg serverens sendte emner for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Mappeliste indlæses…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Ingen er tilgængelige"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Indstillinger for mappesynkronisering"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 24b95ee..ea4acfa 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Auf Daten des E-Mail-Anbieters zugreifen"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Ermöglicht der App, auf Ihre E-Mail-Datenbank zuzugreifen, einschließlich empfangener und gesendeter Nachrichten, Nutzernamen sowie Passwörtern"</string>
     <string name="app_name" msgid="2206468539066258195">"E-Mail"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Fehler suchen"</string>
     <string name="create_action" msgid="6575946089819721958">"Neue hinzufügen"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Keine Kurzantworten"</string>
     <string name="account_settings_action" msgid="589969653965674604">"Kontoeinstellungen"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Verbindungsproblem"</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Nachricht verschieben"</item>
+    <item quantity="other" msgid="5083310421670206821">"Nachrichten verschieben"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Verschieben wird für POP3-Konten nicht unterstützt."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Verschieben nicht möglich, weil mehrere Konten ausgewählt wurden."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Nachrichten im Postausgang und den Ordnern \"Entwürfe\" und \"Gesendet\" können nicht verschoben werden."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Posteingang"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Postausgang"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Entwürfe"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Junk"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Markiert"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Ungelesen"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Fehler suchen"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Posteingang"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Markiert"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Entwürfe"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Postausgang"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Kombinierte Ansicht"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Originalnachricht --------\nBetreff: <xliff:g id="SUBJECT">%1$s</xliff:g>\nVon: <xliff:g id="SENDER">%2$s</xliff:g>\nAn: <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">"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="attachment_not_found" msgid="5219773045406833000">"Anhang kann nicht heruntergeladen werden."</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>
     <string name="login_failed_title" msgid="1737884069957090004">"Anmeldung nicht möglich"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Kontoeinrichtung"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Autorisierung wird angefordert"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Anmelden"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Geben Sie eine gültige E-Mail-Adresse und ein gültiges Passwort ein."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Identisches Konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Sie verwenden diesen Nutzernamen bereits für das Konto \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Dieses Passwort beginnt oder endet mit einem oder mehreren Leerzeichen. Viele Server unterstützen keine Passwörter mit Leerzeichen."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Kontoinformationen werden abgerufen..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Servereinstellungen werden überprüft…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"SMTP-Einstellungen werden überprüft…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Konto wird erstellt…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Kontotyp bestätigen"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Sie haben angegeben, dass <xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g> verwendet, das Konto verwendet jedoch möglicherweise <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Kontoeinrichtung"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Das Konto ist jetzt eingerichtet und die E-Mail ist unterwegs."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Konto benennen (optional)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Ihr Name (wird bei ausgehenden E-Mails angezeigt)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Dieses Feld darf nicht leer sein."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Kontoeinrichtung"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Kontotyp"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Um welchen Kontotyp handelt es sich?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Kontoeinrichtung"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Einstellungen des Eingangsservers"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"Nutzername"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"Passwort"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Wenn ich sie aus Posteingang lösche"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP-Pfadpräfix"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Optional"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Kontoeinrichtung"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Einstellungen des Ausgangsserver"</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">"Sicherheitstyp"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Anmeldung erforderlich"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"Nutzername"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"Passwort"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"Clientzertifikat"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Auswählen"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Clientzertifikat verwenden"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Entfernen"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Keine"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"Mobilgerät-ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Kontoeinstellungen"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Konto-Optionen"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Synchronisierung:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nie"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Alle"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Kontostandard verwenden"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Nutzername oder Passwort ist falsch."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Fehler bei der Anmeldung.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problem mit Kontoeinrichtung"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Bestätigen Sie, dass Nutzername, Passwort und Kontoeinstellungen richtig sind."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Keine sichere Verbindung zum Server möglich"</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Remote-Sicherheitsverwaltung"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Der Server <xliff:g id="SERVER">%s</xliff:g> fordert die Erlaubnis zur Remote-Steuerung einiger Sicherheitsfunktionen auf Ihrem Android-Gerät an. Möchten Sie die Einrichtung dieses Kontos abschließen?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Dieser Server erfordert Sicherheitsfunktionen, die Ihr Android-Gerät nicht unterstützt, darunter: <xliff:g id="ERROR">%s</xliff:g>."</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Sie können Nutzernamen von Konten nicht ändern. Wenn Sie ein Konto mit einem anderen Nutzernamen hinzufügen möchten, wählen Sie \"Konto hinzufügen\" aus."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"Warnung: Wenn Sie die Berechtigung der E-Mail-App zur Verwaltung Ihres Geräts deaktivieren, werden alle E-Mail-Konten, die diese Berechtigung benötigen, mit allen zugehörigen E-Mails, Kontakten, Terminen und anderen Daten gelöscht."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Sicherheitsupdate"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> erfordert, dass Sie Ihre Sicherheitseinstellungen aktualisieren."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Sperr-Passwort abgelaufen"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Die Daten für <xliff:g id="ACCOUNT">%s</xliff:g> werden von Ihrem Gerät gelöscht. Sie können die Daten wiederherstellen, indem Sie Ihre PIN für die Displaysperre oder Ihr Passwort ändern. Möchten Sie die PIN oder das Passwort jetzt ändern?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Nicht gespeicherte Änderungen verwerfen?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Anmeldung nicht möglich"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Nutzername oder Passwort für <xliff:g id="ACCOUNT">%s</xliff:g> ist falsch. Möchten Sie die Daten jetzt ändern?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Fehler bei Ihrer Anmeldung in <xliff:g id="ACCOUNT">%s</xliff:g>, Servermeldung: <xliff:g id="REASON">%s</xliff:g>. Möchten Sie Ihren Nutzernamen und/oder Ihr Passwort aktualisieren?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Anhänge herunterladen"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Anhänge neuer Nachrichten automatisch über WLAN herunterladen"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"E-Mail-Benachrichtigung"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Termin für dieses Kontos synchronisieren"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"E-Mails synchronisieren"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"E-Mails dieses Kontos synchronisieren"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibration"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibration"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Klingelton auswählen"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Servereinstellungen"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Synchronisierungsoptionen"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Diesen Ordner synchronisieren"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Bei aktiver Verbindung werden die E-Mails heruntergeladen."</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"E-Mails: zu synchronisierende Tage"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Bild des Absenders"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Nur einige \"Plus\"-Konten haben einen POP-Zugang, der diesem Programm ermöglicht, eine Verbindung aufzubauen. Sollten Sie nicht dazu in der Lage sein, sich mit Ihrer korrekten E-Mail-Adresse und dem richtigen Passwort anzumelden, verfügen Sie möglicherweise nicht über ein kostenpflichtiges \"Plus\"-Konto. Starten Sie Ihren Webbrowser, um auf diese Konten zuzugreifen."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Richten Sie vor der Erstellung des E-Mail-Kontos ein Passwort für den POP3-E-Mail-Zugang auf der T-Online-Website ein."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Microsoft Exchange"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Konto konnte nicht erstellt werden. Bitte versuchen Sie es erneut."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-Mail"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Aktiviert serverspezifische Sicherheitsrichtlinien"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Einstellungen"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Allgemeine Einstellungen"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Vor dem Löschen bestätigen"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Vor dem Senden bestätigen"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"In E-Mails suchen"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Verwendung der Kamera nicht zulassen"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Geräte-Passwort erforderlich"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Einsatz der letzten Passw. beschränken"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Hört sich gut an!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Ich lese die Nachricht später und melde mich dann."</string>
     <string name="quick_4" msgid="216066940197616025">"Wir können das am besten bei einem Meeting besprechen."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Die Hintergrundsynchronisierung ist für dieses Konto während des Roamings deaktiviert."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Antwort wird gesendet…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Privat (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Privat (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Keine Nachrichten"</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Ordnerauswahl"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Papierkorb des Servers für <xliff:g id="ACCOUNT">%s</xliff:g> auswählen"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Ordner \"Gesendete Elemente\" des Servers für <xliff:g id="ACCOUNT">%s</xliff:g> auswählen"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Ordnerliste wird geladen…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Keine verfügbar"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Synchronisierungseinstellungen für Ordner"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 543c415..bf07e41 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Πρόσβαση στα δεδομένα παρόχου ηλεκτρονικού ταχυδρομείου"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Επιτρέπει στην εφαρμογή την πρόσβαση στη βάση δεδομένων του ηλεκτρονικού ταχυδρομείου σας, συμπεριλαμβανομένων των ληφθέντων μηνυμάτων, των απεσταλμένων, των ονομάτων χρηστών και των κωδικών πρόσβασης."</string>
     <string name="app_name" msgid="2206468539066258195">"Μήνυμα ηλεκτρονικού ταχυδρομείου"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Εντοπισμός σφαλμάτων"</string>
     <string name="create_action" msgid="6575946089819721958">"Δημιουργία νέου"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Δεν υπάρχουν γρήγορες απαντήσεις."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Ρυθμίσεις λογαριασμού"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Πρόβλημα σύνδεσης."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Μετακίνηση μηνύματος"</item>
+    <item quantity="other" msgid="5083310421670206821">"Μετακίνηση μηνυμάτων"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Η μετακίνηση δεν υποστηρίζεται σε λογαριασμούς POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Δεν είναι δυνατή η μετακίνηση επειδή η επιλογή περιλαμβάνει πολλούς λογαριασμούς."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Τα μηνύματα στους φακέλους \"Πρόχειρα\", \"Προς αποστολή\" και \"Απεσταλμένα\" δεν είναι δυνατό να μετακινηθούν."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Εισερχόμενα"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Εξερχόμενα"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Πρόχειρα"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Ανεπιθύμητα"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Με αστέρι"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Μη αναγνωσμένα"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Εντοπισμός σφαλμάτων"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Εισερχόμενα"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Με αστέρι"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Πρόχειρα"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Εξερχόμενα"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Δεν ήταν δυνατή η λήψη αυτής της επισύναψης."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Παρουσιάστηκε κάποιο σφάλμα κατά την αποκωδικοποίηση του μηνύματος."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Δεν ήταν δυνατή η προώθηση μίας ή περισσότερων επισυνάψεων."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Η επισύναψη δεν προωθήθηκε"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Η σύνδεση στον λογαριασμό <xliff:g id="ACCOUNT_NAME">%s</xliff:g> δεν ήταν επιτυχής."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Δεν ήταν δυνατή η σύνδεση"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Ρύθμιση λογαριασμού"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Αίτημα εξουσιοδότησης"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Σύνδεση"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Πληκτρολογήστε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου και έναν έγκυρο κωδικό πρόσβασης."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Διπλότυπος λογαριασμός"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Χρησιμοποιείτε ήδη αυτό το όνομα χρήστη για τον λογαριασμό \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Αυτός κωδικός πρόσβασης ξεκινά ή καταλήγει σε έναν ή περισσότερους χαρακτήρες κενού διαστήματος. Πολλοί διακομιστές δεν υποστηρίζουν κωδικούς πρόσβασης με κενά διαστήματα."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Ανάκτηση στοιχείων λογαριασμού..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Επαλήθευση ρυθμίσεων διακομιστή…"</string>
     <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_names_title" msgid="8780121351085082269">"Ρύθμιση λογαριασμού"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Αυτό το πεδίο δεν μπορεί να είναι κενό."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Ρύθμιση λογαριασμού"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Τύπος λογαριασμού"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Τι τύπος λογαριασμού είναι αυτός;"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Ρύθμιση λογαριασμού"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Ρυθμίσεις διακομιστή εισερχομένων"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ΟΝΟΜΑ ΧΡΗΣΤΗ"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ΚΩΔΙΚΟΣ ΠΡΟΣΒΑΣΗΣ"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Ρύθμιση λογαριασμού"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Ρυθμίσεις διακομιστή εξερχομένων"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"ΔΙΑΚΟΜΙΣΤΗΣ SMTP:"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ΘΥΡΑ"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ΤΥΠΟΣ ΑΣΦΑΛΕΙΑΣ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Να απαιτείται σύνδεση"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ΟΝΟΜΑ ΧΡΗΣΤΗ"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ΚΩΔΙΚΟΣ ΠΡΟΣΒΑΣΗΣ"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"ΠΙΣΤΟΠΟΙΗΤΙΚΟ ΠΕΛΑΤΗ"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Επιλογή"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Χρήση του πιστοποιητικού πελάτη"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Κατάργηση"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Κανένα"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ΑΝΑΓΝΩΡΙΣΤΙΚΟ ΚΙΝΗΤΗΣ ΣΥΣΚΕΥΗΣ"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Ρυθμίσεις λογαριασμού"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"Αποτυχία σύνδεσης.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Απομακρυσμένη διαχείριση ασφαλείας"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"Δεν είναι δυνατό να αλλάξετε το όνομα χρήστη ενός λογαριασμού. Για να προσθέσετε έναν λογαριασμό με διαφορετικό όνομα χρήστη, αγγίξτε την επιλογή \"Προσθήκη λογαριασμού\"."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η απενεργοποίηση της αρμοδιότητας της εφαρμογής ηλεκτρονικού ταχυδρομείου να διαχειρίζεται τη συσκευή σας, θα διαγράψει όλους τους λογαριασμούς ηλεκτρονικού ταχυδρομείου στους οποίους είναι απαραίτητη, καθώς και τα μηνύματα ηλεκτρονικού ταχυδρομείου, τις επαφές, τα συμβάντα ημερολογίου και άλλα δεδομένα."</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>
@@ -168,6 +207,9 @@
     <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> από τη συσκευή σας. Μπορείτε να τα επαναφέρετε αλλάζοντας το PIN ή τον κωδικό πρόσβασης της οθόνης κλειδώματος. Θέλετε να το αλλάξετε τώρα;"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Απόρριψη μη αποθηκευμένων αλλαγών;"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Δεν ήταν δυνατή η σύνδεση"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Το όνομα χρήστη ή ο κωδικός πρόσβασης του λογαριασμού <xliff:g id="ACCOUNT">%s</xliff:g> είναι λάθος. Θέλετε να τα ενημερώσετε τώρα;"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Η σύνδεση στο <xliff:g id="ACCOUNT">%s</xliff:g> απέτυχε. Ο διακομιστής ανέφερε την εξής αιτία: <xliff:g id="REASON">%s</xliff:g> Θέλετε να ενημερώσετε το όνομα χρήστη και τον κωδικό πρόσβασης;"</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>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Συγχρον. συμβ. ημερολ. λογαριασμού"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Συγχρονισμός ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Συγχρονισμός μηνυμάτων ηλεκτρονικού ταχυδρομείου για αυτόν τον λογαριασμό"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Δόνηση"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Δόνηση"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Επιλέξτε ήχο κλήσης"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Ρυθμίσεις διακομιστή"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Επιλογές συγχρονισμού"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Συγχρονισμός αυτού του φακέλου"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Θα γίνεται λήψη των μηνυμάτων κατά τη σύνδεση"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Αριθμός ημερών μηνυμάτων ηλεκτρονικού ταχυδρομείου για συγχρονισμό"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Εικόνα αποστολέα"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Μόνο ορισμένοι λογαριασμοί \"Plus\" περιλαμβάνουν πρόσβαση POP και επιτρέπουν στο πρόγραμμα αυτό να συνδεθεί. Εάν δεν μπορείτε να συνδεθείτε με τη σωστή διεύθυνση ηλεκτρονικού ταχυδρομείου και τον κωδικό πρόσβασης, ενδέχεται να μην έχετε πληρωμένο λογαριασμό \"Plus\". Εκκινήστε το πρόγραμμα περιήγησης ιστού, για να αποκτήσετε πρόσβαση σε αυτούς τους λογαριασμούς ηλεκτρονικού ταχυδρομείου."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Πριν ρυθμίσετε αυτόν τον λογαριασμό ηλεκτρονικού ταχυδρομείου, επισκεφτείτε τον ιστότοπο T-Online και δημιουργήστε έναν κωδικό πρόσβασης για πρόσβαση σε ηλεκτρονικό ταχυδρομείο POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Εταιρικός"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Δεν ήταν δυνατή η δημιουργία του λογαριασμού. Προσπαθήστε ξανά."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Διεύθυνση ηλεκτρονικού ταχυδρομείου"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Ενεργοποιεί πολιτικές ασφαλείας καθορισμένες από διακομιστή"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Ρυθμίσεις"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Γενικές ρυθμίσεις"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Επιβεβαίωση πριν από τη διαγραφή"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Επιβεβαίωση πριν την αποστολή"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Αναζήτηση ηλεκτρονικού ταχυδρομείου"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Να μην επιτρ. η χρήση της κάμ. της συσκ."</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Απαιτείται κρυπτογράφηση συσκευής"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Περιορισμός της χρήσης πρόσφατων κωδικών"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Καλή ιδέα!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Θα το διαβάσω αργότερα και θα επικοινωνήσω μαζί σου."</string>
     <string name="quick_4" msgid="216066940197616025">"Ας κανονίσουμε μία συνάντηση για να συζητήσουμε αυτό το θέμα."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Ο συγχρονισμός στο παρασκήνιο για αυτόν το λογαριασμό είναι απενεργοποιημένος κατά την περιαγωγή."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Αποστολή απάντησης..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Προσωπικός (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Προσωπικός (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Δεν υπάρχουν μηνύματα."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Επιλογέας φακέλου"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Επιλ.φακέλου απορ.διακομ.για <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Επιλογή φακέλου με απεσταλμένα στοιχεία από τον διακομιστή για τον λογαριασμό <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <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>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 97201c9..e03be42 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Access email provider data"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Allows the app to access your email database, including received messages, sent messages, usernames and passwords."</string>
     <string name="app_name" msgid="2206468539066258195">"Email"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Debug"</string>
     <string name="create_action" msgid="6575946089819721958">"Create new"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"No quick responses."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Account settings"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Connection problem."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Move message"</item>
+    <item quantity="other" msgid="5083310421670206821">"Move messages"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Move isn\'t supported on POP3 accounts."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Can\'t move because selection contains multiple accounts."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Messages in Drafts, Outbox and Sent can\'t be moved."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Inbox"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Outbox"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Drafts"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Junk"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Starred"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Unread"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Debug"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Inbox"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Starred"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Drafts"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Outbox"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Combined view"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Original Message --------\nSubject: <xliff:g id="SUBJECT">%1$s</xliff:g>\nFrom: <xliff:g id="SENDER">%2$s</xliff:g>\nTo: <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">"Insert quick response"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Insert quick response"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"One or more attachments in your forwarded message will be downloaded prior to sending."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Couldn\'t download the attachment."</string>
     <string name="message_decode_error" msgid="91396461771444300">"There was an error while decoding the message."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Could not forward one or more attachments"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Attachment not forwarded"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> sign-in unsuccessful."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Couldn\'t sign in"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Account setup"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Requesting authorisation"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Sign in"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Type a valid email address and password."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Duplicate Account"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"You\'re already using this username for the account \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"This password starts or ends with one or more space characters. Many servers don\'t support passwords with spaces."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Retrieving account information…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Validating server settings…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Validating smtp settings…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Creating account…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Confirm account type"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"You indicated <xliff:g id="EMAIL">%1$s</xliff:g> uses <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, but the account may use <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Account setup"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Your account is set up and emails are on their way!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Give this account a name (optional)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Your name (displayed on outgoing messages)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"This field can\'t be blank."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Account setup"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Account type"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"What type of account is this?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Account setup"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Incoming server settings"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"USERNAME"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"PASSWORD"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"When I delete from Inbox"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP path prefix"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Optional"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Account setup"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Outgoing server settings"</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">"SECURITY TYPE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Require sign-in"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"USERNAME"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"PASSWORD"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CLIENT CERTIFICATE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Select"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Use client certificate"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Remove"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"None"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBILE DEVICE ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Account settings"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Account options"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Sync frequency:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Never"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"All"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Use account default"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Your username or password is incorrect."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Login failed.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problem with account setup"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Confirm that username, password and account settings are correct."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Can\'t safely connect to server."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Remote security administration"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"The server <xliff:g id="SERVER">%s</xliff:g> requires that you allow it to remotely control some security features of your Android device. Do you want to finish setting up this account?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"This server requires security features that your Android device doesn\'t support, including: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"You can\'t change an account\'s username. To add an account with a different username, touch Add Account."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"WARNING: Deactivating the Email app\'s authority to administer your device will delete all email accounts that require it, along with their email, contacts, calendar events and other data."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Security update"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> requires you to update your security settings."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Lock-screen password expired"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"The data for <xliff:g id="ACCOUNT">%s</xliff:g> is being erased from your device. You can restore it by changing your lock screen PIN or password. Do you want to change it now?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Discard unsaved changes?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Couldn\'t sign in"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"The username or password for <xliff:g id="ACCOUNT">%s</xliff:g> is incorrect. Do you want to update them now?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Your login to <xliff:g id="ACCOUNT">%s</xliff:g> failed; the server said: <xliff:g id="REASON">%s</xliff:g> Do you want to update your username and/or password?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Download attachments"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Auto-download attachments to recent messages via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Email notifications"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sync calendar event for this account"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sync Email"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sync email for this account"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrate"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrate"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Choose ringtone"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Server settings"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sync options"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sync this folder"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Messages will download when connected"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Days of mail to sync"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Sender image"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Only some \"Plus\" accounts include POP access allowing this programme to connect. If you\'re not able to sign in with your correct email address and password, you may not have a paid \"Plus\" account. Launch the web browser to gain access to these email accounts."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Before setting up this email account, please visit the T-Online website and create a password for POP3 email access."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Corporate"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Couldn\'t create the account. Try again."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Email"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Enables server-specified security policies"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Settings"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"General settings"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Confirm before deleting"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Confirm before sending"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Search emails"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Disallow use of the device\'s camera"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Require device password"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Restrict the reuse of recent passwords"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Sounds good to me!"</string>
     <string name="quick_3" msgid="8070999183033184986">"I\'ll read this later and get back to you."</string>
     <string name="quick_4" msgid="216066940197616025">"Let\'s set up a meeting to discuss this."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Background sync for this account is disabled while roaming."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Sending response…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personal (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personal (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"No messages."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Folder picker"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Select server recycle folder for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Select server sent items folder for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Loading folder list…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"None available"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Folder sync settings"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 97201c9..e03be42 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Access email provider data"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Allows the app to access your email database, including received messages, sent messages, usernames and passwords."</string>
     <string name="app_name" msgid="2206468539066258195">"Email"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Debug"</string>
     <string name="create_action" msgid="6575946089819721958">"Create new"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"No quick responses."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Account settings"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Connection problem."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Move message"</item>
+    <item quantity="other" msgid="5083310421670206821">"Move messages"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Move isn\'t supported on POP3 accounts."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Can\'t move because selection contains multiple accounts."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Messages in Drafts, Outbox and Sent can\'t be moved."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Inbox"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Outbox"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Drafts"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Junk"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Starred"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Unread"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Debug"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Inbox"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Starred"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Drafts"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Outbox"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Combined view"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Original Message --------\nSubject: <xliff:g id="SUBJECT">%1$s</xliff:g>\nFrom: <xliff:g id="SENDER">%2$s</xliff:g>\nTo: <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">"Insert quick response"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Insert quick response"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"One or more attachments in your forwarded message will be downloaded prior to sending."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Couldn\'t download the attachment."</string>
     <string name="message_decode_error" msgid="91396461771444300">"There was an error while decoding the message."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Could not forward one or more attachments"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Attachment not forwarded"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> sign-in unsuccessful."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Couldn\'t sign in"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Account setup"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Requesting authorisation"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Sign in"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Type a valid email address and password."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Duplicate Account"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"You\'re already using this username for the account \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"This password starts or ends with one or more space characters. Many servers don\'t support passwords with spaces."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Retrieving account information…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Validating server settings…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Validating smtp settings…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Creating account…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Confirm account type"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"You indicated <xliff:g id="EMAIL">%1$s</xliff:g> uses <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, but the account may use <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Account setup"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Your account is set up and emails are on their way!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Give this account a name (optional)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Your name (displayed on outgoing messages)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"This field can\'t be blank."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Account setup"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Account type"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"What type of account is this?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Account setup"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Incoming server settings"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"USERNAME"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"PASSWORD"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"When I delete from Inbox"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP path prefix"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Optional"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Account setup"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Outgoing server settings"</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">"SECURITY TYPE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Require sign-in"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"USERNAME"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"PASSWORD"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CLIENT CERTIFICATE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Select"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Use client certificate"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Remove"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"None"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBILE DEVICE ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Account settings"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Account options"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Sync frequency:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Never"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"All"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Use account default"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Your username or password is incorrect."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Login failed.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problem with account setup"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Confirm that username, password and account settings are correct."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Can\'t safely connect to server."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Remote security administration"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"The server <xliff:g id="SERVER">%s</xliff:g> requires that you allow it to remotely control some security features of your Android device. Do you want to finish setting up this account?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"This server requires security features that your Android device doesn\'t support, including: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"You can\'t change an account\'s username. To add an account with a different username, touch Add Account."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"WARNING: Deactivating the Email app\'s authority to administer your device will delete all email accounts that require it, along with their email, contacts, calendar events and other data."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Security update"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> requires you to update your security settings."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Lock-screen password expired"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"The data for <xliff:g id="ACCOUNT">%s</xliff:g> is being erased from your device. You can restore it by changing your lock screen PIN or password. Do you want to change it now?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Discard unsaved changes?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Couldn\'t sign in"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"The username or password for <xliff:g id="ACCOUNT">%s</xliff:g> is incorrect. Do you want to update them now?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Your login to <xliff:g id="ACCOUNT">%s</xliff:g> failed; the server said: <xliff:g id="REASON">%s</xliff:g> Do you want to update your username and/or password?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Download attachments"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Auto-download attachments to recent messages via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Email notifications"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sync calendar event for this account"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sync Email"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sync email for this account"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrate"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrate"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Choose ringtone"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Server settings"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sync options"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sync this folder"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Messages will download when connected"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Days of mail to sync"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Sender image"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Only some \"Plus\" accounts include POP access allowing this programme to connect. If you\'re not able to sign in with your correct email address and password, you may not have a paid \"Plus\" account. Launch the web browser to gain access to these email accounts."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Before setting up this email account, please visit the T-Online website and create a password for POP3 email access."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Corporate"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Couldn\'t create the account. Try again."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Email"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Enables server-specified security policies"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Settings"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"General settings"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Confirm before deleting"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Confirm before sending"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Search emails"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Disallow use of the device\'s camera"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Require device password"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Restrict the reuse of recent passwords"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Sounds good to me!"</string>
     <string name="quick_3" msgid="8070999183033184986">"I\'ll read this later and get back to you."</string>
     <string name="quick_4" msgid="216066940197616025">"Let\'s set up a meeting to discuss this."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Background sync for this account is disabled while roaming."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Sending response…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personal (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personal (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"No messages."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Folder picker"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Select server recycle folder for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Select server sent items folder for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Loading folder list…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"None available"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Folder sync settings"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d9caaed..2775b63 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Acceder a los datos del proveedor de correo"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Permite que la aplicación acceda a la base de datos de tu correo, como mensajes recibidos, mensajes enviados, nombres de usuario y contraseñas."</string>
     <string name="app_name" msgid="2206468539066258195">"Correo"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Depurar"</string>
     <string name="create_action" msgid="6575946089819721958">"Crear una nueva respuesta rápida"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"No hay respuestas rápidas."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Configuración de la cuenta"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Problema de conexión"</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Mover el mensaje"</item>
+    <item quantity="other" msgid="5083310421670206821">"Mover mensajes"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Las cuentas POP3 no permiten mover mensajes."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"No se puede mover porque la selección contiene varias cuentas."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Los mensajes en Borrador, Bandeja de salida y Enviados no se pueden mover."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Bandeja de entrada"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Bandeja de salida"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Borradores"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"No solicitado"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Destacados"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"No leídos"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Depurar"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Bandeja de entrada"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Destacados"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Borradores"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Bandeja de salida"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Vista combinada"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Mensaje original --------\nAsunto: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe: <xliff:g id="SENDER">%2$s</xliff:g>\nPara: <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">"Insertar respuesta rápida"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Insertar respuesta rápida"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Se descargarán uno o más archivos adjuntos de tu mensaje reenviado antes de enviar."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"No se pudo descargar el archivo adjunto."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Se produjo un error al decodificar el mensaje."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"No se pudieron enviar uno o más adjuntos."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"No se reenvió el archivo adjunto"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Acceso a <xliff:g id="ACCOUNT_NAME">%s</xliff:g> sin éxito"</string>
     <string name="login_failed_title" msgid="1737884069957090004">"No se ha podido acceder."</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Configuración de la cuenta"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Solicitando autorización"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Acceso"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Escribe una dirección de correo y contraseña válidas."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Cuenta duplicada"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Ya estás usando este nombre de usuario para la cuenta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Esta contraseña comienza o finaliza con uno o más caracteres con espacios. Muchos servidores no son compatibles con caracteres con espacios."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Recuperando información de la cuenta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Validando configuración del servidor…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Validando configuración de SMTP…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Creando cuenta…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Confirmar tipo de cuenta"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Indicaste que <xliff:g id="EMAIL">%1$s</xliff:g> utiliza <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, pero la cuenta puede utilizar <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Configuración de la cuenta"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Se ha configurado tu cuenta y el correo está en camino."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Asigna un nombre a esta cuenta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Tu nombre (en mensajes salientes)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Este campo no puede estar vacío."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Configuración de la cuenta"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Tipo de cuenta"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"¿Qué tipo de cuenta es?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Configuración de la cuenta"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Configuración del servidor de entrada"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NOMBRE DE USUARIO"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"CONTRASEÑA"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Al eliminarlo desde la bandeja de entrada"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Prefijo de ruta IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Opcional"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Configuración de la cuenta"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Configuración del servidor de salida"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVIDOR SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PUERTO"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TIPO DE SEGURIDAD"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Requiere acceso"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NOMBRE DE USUARIO"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"CONTRASEÑA"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFICADO DE CLIENTE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Seleccionar"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Usar 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 DE DISPOSITIVO MÓVIL"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Configuración de la cuenta"</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>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Todos"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Usar cuenta predeterminada"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"El nombre de usuario o la contraseña son incorrectos."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Se produjo un error al acceder.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Error al configurar la cuenta"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Confirma que el nombre de usuario, la contraseña y la configuración de la cuenta sean correctos."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"No se puede conectar de forma segura al servidor."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Administración de seguridad remota"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"El servidor <xliff:g id="SERVER">%s</xliff:g> debe controlar de forma remota algunas aplicaciones de seguridad del dispositivo. ¿Deseas finalizar la configuración de esta cuenta?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Este servidor requiere funciones de seguridad que tu dispositivo Android no admite, incluidas: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"No puedes cambiar el nombre de usuario de una cuenta. Para agregar una cuenta con un nombre de usuario distinto, toca Agregar cuenta."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ADVERTENCIA: si desactivas la autoridad de la aplicación de correo para administrar tu dispositivo, se eliminarán todas las cuentas de correo que la requieran, así como sus mensajes, contactos, eventos de calendario y otros datos."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Actualización de seguridad"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> requiere que actualices tu configuración de seguridad."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"La contraseña de bloqueo de pantalla expiró"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Los datos de <xliff:g id="ACCOUNT">%s</xliff:g> se eliminarán de su dispositivo. Puedes restaurarlo al cambiar tu PIN o tu contraseña de bloqueo de pantalla. ¿Deseas cambiarlos ahora?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"¿Descartar cambios sin guardar?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"No se pudo acceder"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"El nombre de usuario o la contraseña de <xliff:g id="ACCOUNT">%s</xliff:g> son incorrectos. ¿Quieres actualizarlos ahora?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Se produjo un error al acceder a <xliff:g id="ACCOUNT">%s</xliff:g>. El servidor proporcionó el siguiente motivo: <xliff:g id="REASON">%s</xliff:g>. ¿Deseas actualizar tu nombre de usuario o contraseña?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Descargar archivos adjuntos"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Descarga automática por Wi-Fi de los adjuntos de msjs. recientes"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Notificaciones de correo"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sincronizar evento de calendario de esta cuenta"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronizar correo"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronizar el correo de esta cuenta"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrar"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Seleccionar tono"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Configuración del servidor"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opciones de sincronización"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sincronizar esta carpeta"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Los mensajes se descargarán al conectarte."</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Días de correo electrónico para sincronizar"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Imagen del remitente"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Solo algunas cuentas \"Plus\" incluyen el acceso POP, que permite que este programa se conecte. Si no puedes acceder con tu dirección de correo y contraseña correctas, tal vez no tengas una cuenta \"Plus\" paga. Inicia el navegador web para acceder a estas cuentas de correo."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Para configurar esta cuenta de correo, accede al sitio web de T-Online y crea una contraseña para acceder al correo POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Corporativa"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"No se pudo crear la cuenta. Inténtalo de nuevo."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Correo"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Habilita las políticas de seguridad específicas según el servidor."</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Configuración"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Configuración general"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Confirmar antes de eliminar"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Confirmar antes de enviar"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Buscar correo"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"No usar la cámara del dispositivo"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Requerir la contraseña del dispositivo"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Limitar la reutilización de contraseñas"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Me parece bien."</string>
     <string name="quick_3" msgid="8070999183033184986">"Lo leeré más adelante y me pondré en contacto contigo."</string>
     <string name="quick_4" msgid="216066940197616025">"Vamos a convocar a una reunión para tratar esto."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Se ha inhabilitado la sincronización en segundo plano de esta cuenta en itinerancia."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Enviando respuesta…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personal (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personal (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"No hay mensajes."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Selector de carpeta"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Selecciona la carpeta de papelera del servidor para <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Selecciona la carpeta de elementos enviados del servidor para <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Cargando lista de carpetas..."</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Ninguna disponible"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Configuración de la sincronización de carpetas"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 85ee4a0..963e387 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Acceder a los datos del proveedor de correo electrónico"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Permite que la aplicación acceda a la base de datos de tu correo electrónico, incluidos los mensajes recibidos, los mensajes enviados, los nombres de usuario y las contraseñas."</string>
     <string name="app_name" msgid="2206468539066258195">"Correo"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Depurar"</string>
     <string name="create_action" msgid="6575946089819721958">"Crear nueva"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"No hay respuestas rápidas."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Ajustes de la cuenta"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Error de conexión"</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Mover mensaje"</item>
+    <item quantity="other" msgid="5083310421670206821">"Mover mensajes"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Las cuentas POP3 no permiten mover mensajes."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"No se puede mover porque la selección contiene varias cuentas."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"No se pueden mover los mensajes de las carpetas Borradores, Por enviar ni Enviados."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Recibidos"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Por enviar"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Borradores"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Correo basura"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Destacados"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"No leído"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Depurar"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Recibidos"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Destacados"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Borradores"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Por enviar"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Vista combinada"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Original Message --------\nSubject: <xliff:g id="SUBJECT">%1$s</xliff:g>\nFrom: <xliff:g id="SENDER">%2$s</xliff:g>\nTo: <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">"Usar respuesta rápida"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Usar respuesta rápida"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Uno o varios de los archivos adjuntos del mensaje reenviado se descargarán antes de enviarse."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"No se ha podido descargar el archivo adjunto."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Se ha producido un error al decodificar el mensaje."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Error al enviar uno o varios archivos adjuntos"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Archivo adjunto no reenviado"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Error al iniciar sesión en <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Error al iniciar sesión"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Ajustes de la cuenta"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Solicitando autorización"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Iniciar sesión"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Introduce una dirección de correo electrónico y una contraseña válidas."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Cuenta duplicada"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Ya estás usando este nombre de usuario para la cuenta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Esta contraseña contiene uno o varios espacios al principio o al final. Muchos servidores no admiten contraseñas con espacios."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Recuperando la información de la cuenta..."</string>
     <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">"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_title" msgid="8780121351085082269">"Ajustes de la cuenta"</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>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Tu nombre (en los mensajes enviados)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Este campo no puede estar vacío."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Ajustes de la cuenta"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Tipo de cuenta"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"¿Qué tipo de cuenta tienes?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Ajustes de la cuenta"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Ajustes del servidor de entrada"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NOMBRE DE USUARIO"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"CONTRASEÑA"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Al borrar mensajes"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Prefijo de ruta IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Opcional"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Ajustes de la cuenta"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Ajustes del servidor de salida"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVIDOR SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PUERTO"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TIPO DE SEGURIDAD"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Solicitar inicio de sesión"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NOMBRE DE USUARIO"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"CONTRASEÑA"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFICADO DE CLIENTE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Seleccionar"</string>
     <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 DE DISPOSITIVO MÓVIL"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Ajustes de la cuenta"</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>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Todo"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Usar valores predeterminados de la cuenta"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Nombre de usuario o contraseña incorrectos"</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Error de inicio de sesión\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problema al configurar la cuenta"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Los ajustes de cuenta, contraseña y nombre de usuario de confirmación son correctos."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"No se puede establecer conexión de forma segura con el servidor."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Administración de seguridad remota"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Es necesario que permitas que el servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota algunas funciones de seguridad de tu dispositivo Android. ¿Quieres terminar de configurar esta cuenta?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Este servidor requiere funciones de seguridad que no son compatibles con tu dispositivo Android (por ejemplo: <xliff:g id="ERROR">%s</xliff:g>)."</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"No puedes modificar el nombre de usuario de una cuenta. Si quieres añadir una cuenta con otro nombre de usuario, toca Añadir cuenta."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ADVERTENCIA: si desactivas el permiso de la aplicación Correo para administrar tu dispositivo, se eliminarán todas las cuentas de esta aplicación que requieran su uso, así como las direcciones de correo electrónico, los contactos, los eventos de calendario y otro tipo de datos."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Actualización de seguridad"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> requiere que actualices la configuración de seguridad."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Contraseña bloqueo caducada"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Los datos de <xliff:g id="ACCOUNT">%s</xliff:g> se están borrando del dispositivo. Para restaurarlos, modifica la contraseña o el PIN de la pantalla de bloqueo. ¿Quieres hacerlo ahora?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"¿Quieres descartar los cambios no guardados?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Error al iniciar sesión"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"El nombre de usuario o la contraseña de <xliff:g id="ACCOUNT">%s</xliff:g> son incorrectos. ¿Quieres actualizarlos ahora?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Se ha producido un error al iniciar sesión en <xliff:g id="ACCOUNT">%s</xliff:g>. Respuesta del servidor: <xliff:g id="REASON">%s</xliff:g>. ¿Quieres actualizar tu nombre de usuario o tu contraseña?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Descargar adjuntos"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Descargar automáticamente adjuntos de correos recientes por Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Notificaciones de correo"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sincronizar eventos de calendario para esta cuenta"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronizar correo"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronizar correo de esta cuenta"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrar"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Seleccionar tono"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Ajustes del servidor"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Ajustes de sincronización"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sincronizar esta carpeta"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Los mensajes se descargarán automáticamente al conectarte"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Días para sincronizar correo"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Imagen del remitente"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Solo algunas cuentas \"Plus\" incluyen acceso POP para permitir que este programa se conecte. Si no puedes acceder con tu dirección de correo electrónico y contraseña, es posible que no tengas una cuenta \"Plus\" de pago. Usa el navegador para acceder a estas cuentas de correo."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Para configurar esta cuenta de correo electrónico, accede al sitio web de T-Online y crea una contraseña para acceder al correo electrónico POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Cuenta de trabajo"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"No se ha podido crear la cuenta. Inténtalo de nuevo."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Correo electrónico"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Permite las políticas de seguridad especificadas por el servidor."</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Ajustes"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Ajustes generales"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Confirmar para eliminar"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Confirmar para enviar"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Buscar correo"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"No permitir usar cámara del dispositivo"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Solicitar contraseña del dispositivo"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Restringir nuevo uso contraseñas recientes"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Me parece bien, ¡gracias!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Luego lo leo y te respondo."</string>
     <string name="quick_4" msgid="216066940197616025">"Hagamos una reunión para hablar de este tema."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Se ha inhabilitado la sincronización en segundo plano de esta cuenta en itinerancia."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Enviando respuesta…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personal (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personal (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"No hay ningún mensaje."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Selector de carpetas"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Selecciona la papelera del servidor de <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Seleccionar carpeta servidor de <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Cargando lista de carpetas…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Ninguna disponible"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Ajustes de sincronización de la carpeta"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index c8f4bf0..1c4b3c1 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Juurdepääs e-posti teenusepakkuja andmetele"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Võimaldab rakendusel pääseda teie meiliandmebaasi, sealhulgas vastuvõetud ja saadetud sõnumite, kasutajanimede ning paroolide juurde."</string>
     <string name="app_name" msgid="2206468539066258195">"E-post"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Silumine"</string>
     <string name="create_action" msgid="6575946089819721958">"Loo uus"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Kiirvastuseid pole."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Konto seaded"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Ühendusprobleem."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Teisaldatud sõnum"</item>
+    <item quantity="other" msgid="5083310421670206821">"Teisaldatud sõnumid"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3-kontodel teisaldamist ei toetata."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Ei saa teisaldada, kuna valik sisaldab mitut kontot."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Kaustades Mustandid, Väljundkast ja Saadetud olevaid sõnumeid ei saa teisaldada."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Postkast"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Väljundkast"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Mustandid"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Rämpspost"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Tärniga"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Lugemata"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Silumine"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Postkast"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Tärniga"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Mustandid"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Väljundkast"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Kombineeritud kuva"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Originaalsõnum --------\nTeema: <xliff:g id="SUBJECT">%1$s</xliff:g>\nSaatja: <xliff:g id="SENDER">%2$s</xliff:g>\nSaaja: <xliff:g id="TO">%3$s</xliff:g>\nKoopia: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Kiirvastuse sisestamine"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Sisesta kiirvastus"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Vähemalt üks edastatava sõnumi manus laaditakse enne saatmist alla."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Manuse allalaadimine ebaõnnestus."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Sõnumi dekodeerimisel ilmnes viga."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Ühe või mitme manuse edastamine ebaõnnestus."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Manust ei edastatud"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Kontole <xliff:g id="ACCOUNT_NAME">%s</xliff:g> sisselogimine ebaõnnestus."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Sisselogimine ebaõnnestus"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Konto seadistamine"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Volituse taotlemine"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Sisselogimine"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Sisestage kehtiv e-posti aadress ja parool."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Duplikaatkonto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Kasutate juba konto „<xliff:g id="DUPLICATE">%s</xliff:g>” puhul seda kasutajanime."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"See parool algab või lõpeb ühe või mitme tühikuga. Paljud serverid ei toeta tühikutega paroole."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Kontoteabe saamine ..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Serveri seadete kontrollimine ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"SMTP seadete kontrollimine …"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Konto loomine ..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Kontotüübi kinnitamine"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Märkisite, et <xliff:g id="EMAIL">%1$s</xliff:g> kasutab protokolli <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, kuid konto võib kasutada protokolli <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Konto seadistamine"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Teie konto on seadistatud ja meilid on tulekul."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Anna sellele kontole nimi (valikuline)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Teie nimi (kuvatakse väljuvates sõnumites)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"See väli ei tohi tühi olla."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Konto seadistamine"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Konto tüüp"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Mis tüüpi see konto on?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Konto seadistamine"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Sissetuleva serveri seaded"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"KASUTAJANIMI"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"PAROOL"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Kui kustutan postkastist"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP-i tee prefiks"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Valikuline"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Konto seadistamine"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Väljuva serveri seaded"</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">"TURVATÜÜP"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Sisselogimine on nõutav"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"KASUTAJANIMI"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"PAROOL"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"KLIENDI SERTIFIKAAT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Vali"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Kasuta kliendisertifikaati"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Eemalda"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Puudub"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBIILSEADME ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Konto seaded"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Konto valikud"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Sünkroonimissagedus:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Mitte kunagi"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Kõik"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Kasuta konto vaikeseadet"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Kasutajanimi või parool on vale."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Sisselogimine ebaõnnestus.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Probleem konto seadistusega"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Veenduge, et kasutajanimi, parool ja kontoseaded on õiged."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Serveriga ei saa turvaliselt ühendust."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Kaugturvalisuse haldamine"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Server <xliff:g id="SERVER">%s</xliff:g> nõuab mõnede teie Android-seadme turvafunktsioonide kaugjuhtimise lubamist. Kas soovite lõpetada konto seadistamise?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"See server nõuab turvafunktsioone, mida teie Android-seade ei toeta, sh: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Te ei saa muuta konto kasutajanime. Mõne muu kasutajanimega konto lisamiseks puudutage valikut Lisa konto."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"HOIATUS: meilirakenduse volituse inaktiveerimine seadme haldamiseks kustutab kõik meilikontod, mis seda nõuavad, sh nende meilid, kontaktid, kalendrisündmused ja muud andmed."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Turvavärskendus"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> nõuab, et värskendaksite oma turvaseadeid."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Ekraaniluku parool on aegunud"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> andmed kustutatakse teie seadmest. Taastamiseks muutke oma lukustuskuva PIN-koodi või parooli. Kas soovite kohe muuta?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Kas loobute salvestamata muudatustest?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Sisselogimine ebaõnnestus"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> kasutajanimi või parool on vale. Kas soovite neid kohe värskendada?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Sisselogimine kontole <xliff:g id="ACCOUNT">%s</xliff:g> ebaõnnestus; server vastas: <xliff:g id="REASON">%s</xliff:g> Kas soovite oma kasutajanime ja/või salasõna värskendada?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Manuste allalaadimine"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Hiljutiste sõnumite manuste automaatne allalaadimine WiFi kaudu"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Meiliteatised"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sünkrooni konto kalendri sündmused"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sünkrooni meil"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Konto meili sünkroonimine"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibratsioon"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibreering"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Vali helin"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Serveri seaded"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sünkroonimisvalikud"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sünkrooni see kaust"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Sõnumid laaditakse alla ühenduse loomisel"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Sünkroonitava e-posti päevade arv"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Saatja pilt"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Ainult mõnel kontol „Plus” on POP-juurdepääs, mis lubab programmiga ühendust võtta. Kui te ei saa oma õige e-posti aadressi ja parooliga sisse logida, pole teil võib-olla tasulist kontot „Plus”. Neile meilikontodele juurdepääsuks käivitage veebibrauser."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Enne selle meilikonto loomist külastage T-Online\'i veebisaiti ja looge parool POP3-meilile juurdepääsuks."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Korporatiivne"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Konto loomine ebaõnnestus. Proovige uuesti."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-post"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Võimaldab serveripõhiseid turvaeeskirju"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Seaded"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Üldseaded"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Kinnitamine enne kustutamist"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Kinnitamine enne saatmist"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Otsi meili"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Keela seadme kaamera kasutamine"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Nõua seadme parooli"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Piira hiljutiste paroolide taaskasutamist"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Mulle sobib!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Loen seda hiljem ja võtan siis ühendust."</string>
     <string name="quick_4" msgid="216066940197616025">"Lepime kokku kohtumise, et seda arutada."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Taustsünkroonimine on sellel kontol rändluse ajal keelatud."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Vastuse saatmine ..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Isiklik (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Isiklik (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Sõnumeid pole."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Kausta valija"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Valige <xliff:g id="ACCOUNT">%s</xliff:g> jaoks serveri prügikast"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Valige <xliff:g id="ACCOUNT">%s</xliff:g> jaoks serverikaust"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Kaustaloendi laadimine ..."</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Ükski pole saadaval"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Kausta sünkroonimise seaded"</string>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
deleted file mode 100644
index 2f8019a..0000000
--- a/res/values-eu-rES/strings.xml
+++ /dev/null
@@ -1,296 +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">"Irakurri mezuetako eranskinak"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"Mezuetako eranskinak irakurtzea baimentzen die aplikazioei."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"Atzitu posta-hornitzailearen datuak"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"Posta elektronikoaren datu-basea atzitzea baimentzen die aplikazioei, besteak beste, jasotako eta bidalitako mezuak, erabiltzaile-izenak eta pasahitzak."</string>
-    <string name="app_name" msgid="2206468539066258195">"Helbide elektronikoa"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Araztu"</string>
-    <string name="create_action" msgid="6575946089819721958">"Sortu"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"Erantzun bizkorrik gabe."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"Kontuaren ezarpenak"</string>
-    <string name="status_network_error" msgid="526826323872477973">"Konexio-arazoa."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"Eraman mezua"</item>
-    <item quantity="other" msgid="5083310421670206821">"Eraman mezuak"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 kontuek ez dute mezuak mugitzerik onartzen."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Ezin dira mezuak mugitu hautapenean kontu bat baino gehiagoko mezuak daudelako."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Zirriborroak, Irteera-ontzia eta Bidalitakoak karpetetako mezuak ezin dira mugitu."</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Sarrera-ontzia"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Irteera-ontzia"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Zirriborroak"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"Zaborrontzia"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"Bidalitako mezuak"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Mezu baztergarriak"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Izardunak"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Irakurri gabe"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Sarrera-ontzia"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Izardunak"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Zirriborroak"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Irteera-ontzia"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Ikuspegi bateratua"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Jatorrizko mezua --------\nGaia: <xliff:g id="SUBJECT">%1$s</xliff:g>\nIgorlea: <xliff:g id="SENDER">%2$s</xliff:g>\nHartzailea: <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">"Sartu erantzun bizkorra"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Sartu erantzun bizkorra"</string>
-    <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Birbidalitako mezuko eranskin bat edo gehiago bidali aurretik deskargatuko dira."</string>
-    <string name="attachment_not_found" msgid="5219773045406833000">"Ezin izan da eranskina deskargatu."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"Errore bat gertatu mezua deskodetzean."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Ezin izan dira eranskin bat edo gehiago birbidali."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"Ez da eranskina birbidali"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"Ezin izan da <xliff:g id="ACCOUNT_NAME">%s</xliff:g> kontuan saioa hasi."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"Ezin izan da saioa hasi"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"Kontuaren konfigurazioa"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"Eskatu baimena"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"Hasi saioa"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"Ezin da autentifikatu"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"Helbide elektronikoa edo pasahitza okerra da"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"Helbide elektronikoa:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"Posta-kontua"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"Kontua urrats gutxitan konfigura dezakezu."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"Helbide elektronikoa"</string>
-    <string name="or_label" msgid="6408695162723653446">"EDO"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Hasi saioa Google-n"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"PASAHITZA"</string>
-    <string name="password_hint" msgid="4226682910292828279">"Pasahitza"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s zerbitzuarekin hasi duzu saioa"</string>
-    <string name="authentication_label" msgid="914463525214987772">"AUTENTIFIKAZIOA"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"Gehitu autentifikazioa"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"Garbitu autentifikazioa"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"Eskuzko konfigurazioa"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Idatzi baliozko helbide elektronikoa eta pasahitza."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Bikoiztu kontua"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Dagoeneko erabiltzen duzu erabiltzaile-izen hori \"<xliff:g id="DUPLICATE">%s</xliff:g>\" kontuan."</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"Pasahitzak zuriune-karaktere batekin edo gehiagorekin hasten da. Zerbitzari askok ez dituzte zuriuneak dituzten pasahitzak onartzen."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Kontuaren informazioa eskuratzen…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Zerbitzariaren ezarpenak balidatzen…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"SMTP ezarpenak balidatzen…"</string>
-    <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Kontua sortzen…"</string>
-    <string name="account_setup_ab_headline" msgid="1434091698882290052">"Berretsi kontu mota"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"<xliff:g id="EMAIL">%1$s</xliff:g> kontuak <xliff:g id="USERPROTOCOL">%2$s</xliff:g> erabiltzen duela adierazi duzu, baina baliteke kontuak <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> erabiltzea"</string>
-    <string name="account_setup_names_title" msgid="8780121351085082269">"Kontuaren konfigurazioa"</string>
-    <string name="account_setup_names_headline" msgid="2031978210683887370">"Kontua konfiguratu da eta posta jasoko duzu laster!"</string>
-    <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Eman izena kontu honi (aukerakoa)"</string>
-    <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Zure izena (irteerako mezuetan bistaratzen da)"</string>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Eremuak ezin du hutsik egon."</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Kontuaren konfigurazioa"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Kontu mota"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Zer motatako kontua da hau?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Kontuaren konfigurazioa"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Sarrerako zerbitzariaren ezarpenak"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ERABILTZAILE-IZENA"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"PASAHITZA"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"Pasahitza"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"ZERBITZARIA"</string>
-    <string name="account_setup_incoming_port_label" msgid="402562424498833560">"ATAKA"</string>
-    <string name="account_setup_incoming_security_label" msgid="8360505617331971663">"SEGURTASUN MOTA"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="2461510827337484818">"Bat ere ez"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="2834386066577239560">"SSL/TLS (onartu ziurtagiri guztiak)"</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 (onartu ziurtagiri guztiak)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="3892291833944170882">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="2341742235654301690">"Ezabatu mezu elektronikoak zerbitzaritik"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="5777530843489961009">"Inoiz ez"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Sarrera-ontzitik ezabatzean"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP bide-izenaren aurrizkia"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Aukerakoa"</string>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Kontuaren konfigurazioa"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Irteerako zerbitzariaren ezarpenak"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP ZERBITZARIA"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ATAKA"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"SEGURTASUN MOTA"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Eskatu saioa hasteko"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ERABILTZAILE-IZENA"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"PASAHITZA"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"BEZERO-ZIURTAGIRIA"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Hautatu"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Erabili bezeroaren ziurtagiria"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Kendu"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Bat ere ez"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"GAILU MUGIKORRAREN IDa"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"Kontuaren ezarpenak"</string>
-    <string name="account_setup_options_headline" msgid="4810292194395251968">"Kontuaren aukerak"</string>
-    <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 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>
-    <string name="account_setup_options_sync_calendar_label" msgid="303441956432308807">"Sinkronizatu kontu honen egutegia"</string>
-    <string name="account_setup_options_sync_email_label" msgid="468957966555663131">"Sinkronizatu kontu honen posta"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="4085327585082867216">"Deskargatu eranskinak automatikoki Wi-Fi sarera konektatuta nagoenean"</string>
-    <string name="account_setup_failed_dlg_title" msgid="7923577224474005464">"Ezin izan da amaitu"</string>
-    <string name="account_setup_options_mail_window_label" msgid="4737241149297585368">"Sinkronizatu igorle honen mezu elektronikoak:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="7407981634952005775">"Automatikoa"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"Azken eguna"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"Azken hiru egunak"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"Azken astea"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"Azken bi asteak"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="3228265299330513816">"Azken hilabetea"</string>
-    <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Guztiak"</string>
-    <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Erabili kontuaren balio lehenetsia"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Erabiltzaile-izena edo pasahitza okerra da."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Ezin izan da saioa hasi.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Arazo bat dago kontuaren konfigurazioan"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Berretsi erabiltzaile-izena, pasahitza eta kontuaren ezarpenak zuzenak direla."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Ezin da zerbitzarira segurtasunez konektatu."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"Ezin da zerbitzarira segurtasunez konektatu.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="4607859382193244795">"Bezero-ziurtagiria behar da. Zerbitzarira bezero-ziurtagiri batekin konektatu nahi duzu?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="4574461885959029072">"Ziurtagiria baliogabea da edo ezin da atzitu."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="430054384233036305">"Zerbitzariak errore batekin erantzun du. Egiaztatu zure erabiltzaile-izena eta pasahitza, eta saiatu berriro."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="1180197172141077524">"Ezin da zerbitzarira konektatu."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="3889441611138037320">"Ezin izan da zerbitzarira konektatu.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_tls_required" msgid="1902309158359287958">"TLS segurtasuna behar da baina zerbitzariak ez du onartzen."</string>
-    <string name="account_setup_failed_auth_required" msgid="2684010997018901707">"Zerbitzariak ez ditu gure autentifikazio-metodoak onartzen."</string>
-    <string name="account_setup_failed_security" msgid="1627240499907011040">"Ezin izan da zerbitzarirako konexioa ireki segurtasun-errore bat gertatu delako."</string>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"Ezin izan da zerbitzarirako konexioa ireki."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"Zerbitzari-helbide okerra idatzi duzu edo Postak onartzen ez duen protokolo-bertsioa eskatzen du zerbitzariak."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"Ez duzu zerbitzari honekin sinkronizatzeko baimenik. Informazio gehiago lortzeko, jarri zerbitzariaren administratzailearekin harremanetan."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"Urruneko segurtasun-administrazioa"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"<xliff:g id="SERVER">%s</xliff:g> zerbitzariak Android gailuaren segurtasun-eginbide batzuk urrunetik kontrolatzea eskatzen du. Kontua konfiguratzen amaitu nahi duzu?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Android gailuak onartzen ez dituen segurtasun-eginbide batzuk eskatzen ditu zerbitzariak, besteak beste: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Ezin duzu kontu baten erabiltzaile-izena aldatu. Beste izen bat duen kontu bat gehitzeko, ukitu Gehitu kontua."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"ABISUA: Posta aplikazioari gailua administratzeko baimena desaktibatzen badiozu, hori eskatzen duten posta-kontu guztiak ezabatuko dira, bertako mezuak, kontaktuak, egutegiko gertaerak eta bestelako datuak barne."</string>
-    <string name="account_security_dialog_title" msgid="7003032393805438164">"Segurtasun-eguneratzea"</string>
-    <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> kontuak segurtasun-ezarpenak eguneratzea eskatzen du."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="3249185558872836884">"Ezin da \"<xliff:g id="ACCOUNT">%s</xliff:g>\" kontua sinkronizatu segurtasun-eskakizunak direla-eta."</string>
-    <string name="security_needed_ticker_fmt" msgid="7099561996532829229">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" kontuak segurtasun-ezarpenak eguneratzea eskatzen du."</string>
-    <string name="security_changed_ticker_fmt" msgid="3823930420292838192">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" kontuak bere segurtasun-ezarpenak aldatu ditu. Erabiltzaileak ez du ezer egin beharrik."</string>
-    <string name="security_notification_content_update_title" msgid="6321099538307807621">"Segurtasuna eguneratu behar da"</string>
-    <string name="security_notification_content_change_title" msgid="615639963487448183">"Segurtasun-gidalerroak aldatu egin dira"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"Ezin dira gidalerroak gorde"</string>
-    <string name="account_security_title" msgid="6072273231606918870">"Gailuaren segurtasuna"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="2527501853520160827">"<xliff:g id="SERVER">%s</xliff:g> zerbitzariak Android gailuaren segurtasun-eginbide batzuk urrunetik kontrolatzea eskatzen du."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="8155332642922842729">"Editatu xehetasunak"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="5543005790538884060">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" kontuak blokeatutako pantailaren PINa edo pasahitza aldatzea eskatzen du."</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"Gailuko pasahitza iraungitzear"</string>
-    <string name="password_expired_ticker" msgid="3098703963402347483">"Pantaila blokeatuaren PINa edo pasahitza iraungi da."</string>
-    <string name="password_expired_content_title" msgid="7379094218699681984">"Pantaila blokeatuaren pasahitza iraungi da"</string>
-    <string name="password_expire_warning_dialog_title" msgid="4901499545146045672">"Gailuko pasahitza iraungitzear dago"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="1093389293050776319">"Pantaila desblokeatzeko PINa edo pasahitza laster aldatu behar dituzu. Bestela, <xliff:g id="ACCOUNT">%s</xliff:g> kontuko datuak ezabatu egingo dira. Orain aldatu nahi duzu?"</string>
-    <string name="password_expired_dialog_title" msgid="7275534155170185252">"Pantaila blokeatuaren pasahitza iraungi da"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"<xliff:g id="ACCOUNT">%s</xliff:g> kontuko datuak gailutik ezabatu egingo dira. Datuak leheneratzeko, pantaila blokeatuaren PINa edo pasahitza aldatu behar duzu. Orain aldatu nahi duzu?"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Gorde gabeko aldaketak baztertu nahi dituzu?"</string>
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Ezin izan da saioa hasi"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> kontuaren erabiltzaile-izena edo pasahitza ez da zuzena. Aldatu egin nahi dituzu?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Ezin izan da <xliff:g id="ACCOUNT">%s</xliff:g> kontuan saioa hasi. Zerbitzariak emandako arrazoia: <xliff:g id="REASON">%s</xliff:g>. Erabiltzaile-izena edota pasahitza aldatu nahi dituzu?"</string>
-    <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Deskargatu eranskinak"</string>
-    <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Deskargatu automatikoki azken mezuen eranskinak Wi-Fi bidez"</string>
-    <string name="account_settings_notify_label" msgid="8621226576645167987">"Posta elektroniko bidezko jakinarazpenak"</string>
-    <string name="account_settings_summary" msgid="4733776978291376161">"Sinkronizazio-maiztasuna, jakinarazpenak eta abar."</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"Bidali jakinarazpena mezu elektronikoak iristean"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"Sinkronizazio-maiztasuna"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"Sarrerako postaren ezarpenak"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"Erabiltzaile-izena, pasahitza eta sarrerako zerbitzariaren gainerako ezarpenak"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"Irteerako postaren ezarpenak"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"Erabiltzaile-izena, pasahitza eta irteerako zerbitzariaren bestelako ezarpenak"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"Gidalerroak aplikatzen dira"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"Bat ere ez"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"Onartu gabeko gidalerroak"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"Bat ere ez"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"Saiatu sinkronizatzen"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"Kontu hau sinkronizatzeko, ukitu hau"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"Kontuaren izena"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"Zure izena"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"Erantzun bizkorrak"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"Editatu mezu elektronikoak idaztean maiz idatzi ohi duzun testua"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"Jakinarazpenen ezarpenak"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"Datu-erabilera"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"Segurtasun-gidalerroak"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"Sistemaren karpetak"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"Zaborrontzia karpeta"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"Hautatu zerbitzariaren zaborrontzi-karpeta"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"Hautatu zerbitzariaren Zaborrontzia karpeta"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"Bidalitako elementuen karpeta"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"Hautatu zerbitzariaren bidalitako elementuen karpeta"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"Hautatu zerbitzariaren bidalitako elementuen karpeta"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"Erantzun bizkorra"</string>
-    <string name="save_action" msgid="5740359453077441466">"Gorde"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"Sinkronizatu kontaktuak"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"Sinkronizatu kontu honen kontaktuak"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"Sinkronizatu egutegia"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinkronizatu kontu honen egutegiko gertaerak"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sinkronizatu posta"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sinkronizatu kontu honen posta"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Egin dar-dar"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"Aukeratu tonua"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"Zerbitzariaren ezarpenak"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sinkronizazio-aukerak"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"Sinkronizazio-aukerak (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sinkronizatu karpeta hau"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Mezuak deskargatuko dira konexioa dagoenean"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Sinkronizatu beharreko postaren egun kopurua"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Igorlearen irudia"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"\"Plus\" kontu batzuek soilik dute programa honi konektatzeko aukera ematen dion POP sarbidea. Ezin baduzu helbide elektroniko eta pasahitz zuzenekin saioa hasi, baliteke ordainpeko \"Plus\" konturik ez izatea. Abiarazi web-arakatzailea posta-kontu horietarako sarbidea lortzeko."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"Posta-kontu hori konfiguratu aurretik, joan T-Online webgunera eta sortu POP3 postarako sarbiderako pasahitza."</string>
-    <string name="exchange_name" msgid="3793803477985438102">"Enpresakoa"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"Ezin izan da kontua sortu. Saiatu berriro."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"Posta"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"Zerbitzariak zehaztutako segurtasun-gidalerroak gaitzen ditu"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"Ezarpenak"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"Ezarpen orokorrak"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Berretsi ezabatu aurretik"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Berretsi bidali aurretik"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"Bilatu postan"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Ez baimendu gailuaren kamera erabiltzea"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"Eskatu gailuaren pasahitza"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"Debekatu azken pasahitzak berriro erabiltzea"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"Eskatu pasahitzak iraungitzea"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"Eskatu gailu inaktiboen pantaila blokeatzea"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"Mugatu sinkronizatu beharreko egutegiko gertaerak"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"Mugatu sinkronizatutako mezu elektroniko kopurua"</string>
-    <string name="quick_1" msgid="9130521670178673190">"Eskerrik asko!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"Ongi iruditzen zait!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"Geroxeago irakurriko dut eta erantzungo dizut."</string>
-    <string name="quick_4" msgid="216066940197616025">"Egin dezagun bilera bat hori eztabaidatzeko."</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"Kontuan atzeko planoan sinkronizatzeko aukera desgaituta dago ibiltaritzan."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"Erantzuna bidaltzen..."</string>
-    <string name="no_conversations" msgid="3785854971159919343">"Ez dago mezurik."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"Karpeta-hautatzailea"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"Hautatu <xliff:g id="ACCOUNT">%s</xliff:g> kontuaren zerbitzariaren Zaborrontzia karpeta"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"Hautatu zerbitzariaren <xliff:g id="ACCOUNT">%s</xliff:g> kontuaren bidalitako mezuen karpeta"</string>
-    <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Karpeta-zerrenda kargatzen…"</string>
-    <string name="no_quick_responses" msgid="8716297053803961304">"Ez dago bat ere erabilgarri"</string>
-    <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Karpetak sinkronizatzeko ezarpenak"</string>
-</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 69aa863..3f743b0 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"دسترسی به داده‌های ارائه‌کننده ایمیل"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"به برنامهٔ کاربردی اجازه می‌دهد به پایگاه داده ایمیل شما، شامل پیام‌های دریافتی، پیام‌های ارسالی، نام‌های کاربری و گذرواژه‌ها دسترسی داشته باشد."</string>
     <string name="app_name" msgid="2206468539066258195">"ایمیل"</string>
+    <string name="debug_title" msgid="1337476992195531309">"رفع خطا"</string>
     <string name="create_action" msgid="6575946089819721958">"ایجاد مورد جدید"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"پاسخ سریعی وجود ندارد."</string>
     <string name="account_settings_action" msgid="589969653965674604">"تنظیمات حساب"</string>
+    <string name="status_network_error" msgid="526826323872477973">"مشکل اتصال."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"انتقال پیام"</item>
+    <item quantity="other" msgid="5083310421670206821">"انتقال پیام‌ها"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"‏انتقال در حساب‌های POP3 پشتیبانی نمی‌شود."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"انتقال امکان‌پذیر نیست. مورد انتخابی شامل چندین حساب است."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"پیام‌های موجود در پیش‌نویس‌ها، صندوق خروجی و موارد ارسالی قابل انتقال نیستند."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"صندوق ورودی"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"صندوق خروجی"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"پیش‌نویس‌ها"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"ناخواسته"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"ستاره‌دار"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"خوانده نشده"</string>
-    <string name="debug_title" msgid="1337476992195531309">"رفع خطا"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"صندوق ورودی"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"ستاره‌دار"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"پیش‌نویس‌ها"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"صندوق خروجی"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"نمی‌توان پیوست را دانلود کرد."</string>
     <string name="message_decode_error" msgid="91396461771444300">"هنگام رمزگشایی پیام، خطایی روی داد."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"یک یا چند پیوست باز ارسال نشد."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"پیوست هدایت نشد"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"ورود به سیستم <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ناموفق بود."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"ورود به سیستم ممکن نیست"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بایت"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بایت"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> کیلوبایت"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> کیلوبایت"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> مگابایت"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> مگابایت"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> گیگابایت"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> گیگابایت"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"تنظیم حساب"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"در حال درخواست تأیید اعتبار"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"ورود به سیستم"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"یک آدرس ایمیل و گذرواژه معتبر تایپ کنید."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"حساب تکراری"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"شما در حال حاضر از این نام کاربری برای حساب \"<xliff:g id="DUPLICATE">%s</xliff:g>\" استفاده می‌کنید."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"این رمز ورود دارای یک یا چند نویسه فاصله در ابتدا یا انتهای خود است. بسیاری از سرورها از رمز ورودهای دارای فاصله پشتیبانی نمی‌کنند."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"در حال بازیابی اطلاعات حساب..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"درحال تأیید اعتبار تنظیمات سرور..."</string>
     <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_names_title" msgid="8780121351085082269">"تنظیم حساب"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"این قسمت نمی‌تواند خالی باشد."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"تنظیم حساب"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"نوع حساب"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"این چه نوع حسابی است؟"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"تنظیم حساب"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"تنظیمات سرور ورودی"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"نام کاربری"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"گذرواژه"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"تنظیم حساب"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"تنظیمات سرور خروجی"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"‏سرور SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"درگاه"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"نوع امنیت"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"ورود به سیستم لازم است"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"نام کاربری"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"گذرواژه"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"گواهینامه سرویس گیرنده"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"انتخاب"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"استفاده از گواهی مشتری"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"حذف"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"هیچکدام"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"شناسه دستگاه همراه"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"تنظیمات حساب"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"ورود به سیستم انجام نشد. \n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"مدیریت امنیت راه دور"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"‏شما نمی‎توانید نام کاربری یک حساب را تغییر دهید. برای افزودن حسابی با یک نام کاربری دیگر، «افزودن حساب» را لمس کنید."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"اخطار: غیرفعال کردن اختیار برنامه ایمیل برای سرپرستی دستگاه شما، همه حساب‌های ایمیلی که به آن احتیاج دارند، به همراه ایمیل، مخاطبین، رویدادهای تقویم و سایر داده‌های آن‌ها را حذف می‌کند."</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>
@@ -168,6 +207,9 @@
     <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_login_dialog_title" msgid="2250911725501042470">"ورود به سیستم ممکن نیست"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"نام کاربری یا گذرواژه <xliff:g id="ACCOUNT">%s</xliff:g> نادرست است. آیا می‌خواهید هم‌اکنون آن‌ها را به‌روز کنید؟"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"ورود به سیستم شما به <xliff:g id="ACCOUNT">%s</xliff:g> انجام نشد؛ سرور این پیام را داد: <xliff:g id="REASON">%s</xliff:g> آیا می‌خواهید نام کاربری و/یا  گذرواژه خود را به‌روزرسانی کنید؟"</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>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"همگام‌‌سازی رویداد تقویم برای این حساب"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"همگام‌سازی ایمیل"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"همگام‌سازی ایمیل برای این حساب"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"لرزش"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"لرزش"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"انتخاب آهنگ زنگ"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"تنظیمات سرور"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"گزینه‌های همگام‌سازی"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"همگام‌سازی این پوشه"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"پس از برقراری اتصال، پیام‌ها دانلود می‌شوند"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"تعداد روزها برای همگام‌سازی نامه‌ها"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"تصویر فرستنده"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"‏فقط برخی از حساب‌های \"Plus\" از جمله دسترسی POP به این برنامه اجازه می‌دهند متصل شود. اگر نمی‌توانید با گذرواژه و آدرس ایمیل درست خود به سیستم وارد شوید، ممکن است فاقد یک حساب \"Plus\" غیر رایگان باشید. لطفاً مرورگر وب را برای دسترسی به این حساب‌های ایمیل راه‌اندازی کنید."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"‏قبل از تنظیم این حساب ایمیل، از وبسایت T-Online بازدید کرده و یک گذرواژه برای دسترسی ایمیل POP3 ایجاد کنید."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"شرکت"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"حساب ایجاد نشد. دوباره امتحان کنید."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"ایمیل"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"خط مشی‌های امنیتی تعیین شده توسط سرور را فعال می‌کند"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"تنظیمات"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"تنظیمات کلی"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"تأیید قبل از حذف"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"تأیید قبل از ارسال"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"جستجوی ایمیل"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"استفاده از دوربین دستگاه مجاز نیست"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"گذرواژهٔ دستگاه لازم است"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"استفاده مجدد از گذرواژه‌های اخیر محدود است"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"به نظرم خوب است!"</string>
     <string name="quick_3" msgid="8070999183033184986">"بعداً این را میخوانم و به شما اطلاع میدهم."</string>
     <string name="quick_4" msgid="216066940197616025">"بیایید یک جلسه تشکیل بدهیم و درباره آن گفتگو کنیم."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"هنگام رومینگ، همگام‌سازی پس‌زمینه برای این حساب غیرفعال است."</string>
     <string name="confirm_response" msgid="6764021931370809514">"در حال ارسال پاسخ…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"‏شخصی (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"‏شخصی (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"پیامی موجود نیست."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"انتخابگر پوشه"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"پوشه حذف‌ شده‌های سرور را برای <xliff:g id="ACCOUNT">%s</xliff:g> انتخاب کنید"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"سرور پوشه موارد ارسال‌ شده برای <xliff:g id="ACCOUNT">%s</xliff:g> را انتخاب کنید"</string>
     <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>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index cf30def..42ab9e0 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Käytä sähköpostintarjoajan tietoja"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Antaa sovelluksen käyttää sähköpostitietokantaasi, mukaan lukien vastaanotetut viestit, lähetetyt viestit, käyttäjänimet ja salasanat."</string>
     <string name="app_name" msgid="2206468539066258195">"Sähköposti"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Virheenjäljitys"</string>
     <string name="create_action" msgid="6575946089819721958">"Luo uusi"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Ei pikavastauksia."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Tilin asetukset"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Yhteysongelma."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Siirrä viesti"</item>
+    <item quantity="other" msgid="5083310421670206821">"Siirrä viestit"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3-tilit eivät tue siirtoa."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Ei voi siirtää. Valinta sisältää useita tilejä."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Luonnokset-, Lähtevät- ja Lähetetyt-kansioissa olevia viestejä ei voi siirtää."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Postilaatikko"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Lähtevät"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Luonnokset"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Roskaposti"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Tähdelliset"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Lukemattomat"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Virheenjäljitys"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Postilaatikko"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Tähdelliset"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Luonnokset"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Lähtevät"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Yhdistetty näkymä"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Alkuperäinen viesti --------\nAihe: <xliff:g id="SUBJECT">%1$s</xliff:g>\nLähettäjä: <xliff:g id="SENDER">%2$s</xliff:g>\nVastaanottaja: <xliff:g id="TO">%3$s</xliff:g>\nKopio: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Lisää pikavastaus"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Lisää pikavastaus"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Vähintään yksi edelleen lähetettävän viestisi liitteistä ladataan ennen lähettämistä."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Liitettä ei voitu ladata."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Virhe purettaessa viestiä."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Vähintään yhden liitteen edelleenlähettäminen epäonnistui."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Liitettä ei lähetetty edelleen"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Kirjautuminen tiliin <xliff:g id="ACCOUNT_NAME">%s</xliff:g> epäonnistui."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Kirjautuminen ei onnistu"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> t"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> t"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kt"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kt"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Mt"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Mt"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Gt"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Gt"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Tilin asetukset"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Pyydetään valtuutusta"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Kirjaudu sisään"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Anna kelvollinen sähköpostiosoite ja salasana."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Päällekkäiset tilit"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Käytät tätä käyttäjänimeä jo tilissä <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Tämän salasanan alussa tai lopussa on välilyönti. Monet palvelimet eivät tue välilyöntejä sisältäviä salasanoja."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Noudetaan tilin tietoja…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Vahvistetaan palvelimen asetuksia..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Vahvistetaan SMTP-asetuksia..."</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Luodaan tiliä..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Vahvista tilin tyyppi"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Ilmoitit, että <xliff:g id="EMAIL">%1$s</xliff:g> käyttää protokollaa <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, mutta tilin käytössä saattaa olla <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Tilin asetukset"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Tili on määritetty ja sähköposteja noudetaan."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Anna tilille nimi (valinnainen)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Oma nimi (näytetään lähtevissä viesteissä)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Kenttä ei voi olla tyhjä."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Tilin asetukset"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Tilin tyyppi"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Millainen tili tämä on?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Tilin asetukset"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Saapuvan postin palvelimen asetukset"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"KÄYTTÄJÄTUNNUS"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"SALASANA"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Kun poistan viestin postilaatikosta"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP-polun etuliite"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Valinnainen"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Tilin asetukset"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Lähtevän postin palvelimen asetukset"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP-PALVELIN"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORTTI"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"SUOJAUSTYYPPI"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Vaadi kirjautuminen"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"KÄYTTÄJÄTUNNUS"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"SALASANA"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"ASIAKASSOVELLUKSEN VARMENNE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Valitse"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Käytä asiakasvarmennetta"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Poista"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Ei mitään"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBIILILAITTEEN TUNNUS"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Tilin asetukset"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Tiliasetukset"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Synkronoinnin tiheys:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Ei koskaan"</string>
@@ -129,6 +166,7 @@
     <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änimi tai salasana on virheellinen."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Kirjautuminen epäonnistui.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Suojauksen etähallinta"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Palvelin <xliff:g id="SERVER">%s</xliff:g> vaatii, että sen sallitaan hallita joitakin Android-laitteen suojaustoiminnoista. Haluatko määrittää tämän tilin loppuun?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Tämä palvelin edellyttää turvaominaisuuksia, joita Android-laitteesi ei tue, kuten: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Et voi muuttaa tilin käyttäjänimeä. Voit lisätä tilin eri käyttäjänimellä koskettamalla kohtaa Lisää tili."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"VAROITUS: jos poistat sähköpostisovellukselta oikeuden hallinnoida laitettasi, myös kaikki sovellukseen liittyvät sähköpostitilit sekä niiden sähköpostit, yhteystiedot, kalenteritapahtumat ja muut tiedot poistetaan."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Tietoturvapäivitys"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> pyytää sinua päivittämään suojausasetuksesi."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Ruudunlukituksen salasana vanhentunut"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Tilin <xliff:g id="ACCOUNT">%s</xliff:g> tietoja poistetaan laitteeltasi. Voit palauttaa tilin vaihtamalla ruudunlukituksen PIN-koodin tai salasanan. Haluatko vaihtaa koodin nyt?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Hylätäänkö tallentamattomat muutokset?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Kirjautuminen ei onnistu."</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Tilin <xliff:g id="ACCOUNT">%s</xliff:g> käyttäjänimi tai salasana on virheellinen. Haluatko päivittää ne nyt?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Kirjautuminen tiliin <xliff:g id="ACCOUNT">%s</xliff:g> epäonnistui. Palvelimen ilmoittama syy: <xliff:g id="REASON">%s</xliff:g> Haluatko päivittää käyttäjänimesi ja/tai salasanasi?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Lataa liitetiedostoja"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Lataa viimeaikaisten viestien liitteet WiFi-yhteyden kautta."</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Sähköposti-ilmoitukset"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synkronoi tilin kalenteritapahtuma"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synkronoi sähköposti"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synkronoi tämän tilin sähköpostit"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Värinä"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Värinä"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Valitse soittoääni"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Palvelinasetukset"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Synkronointiasetukset"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Synkronoi tämä kansio"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Viestit ladataan, kun yhteys on käytössä."</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Synkronoitavat päivät"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Lähettäjän kuva"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Vain joihinkin Plus-tileihin sisältyy POP-käyttö, joka sallii tämän ohjelman muodostaa yhteyden. Jos et pysty kirjautumaan tiliisi sähköpostiosoitteellasi ja salasanallasi, sinulla ei ehkä ole maksullista Plus-tiliä. Pääset käyttämään näitä sähköpostitilejä käynnistämällä verkkoselaimen."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Käy ennen tämän sähköpostitilin luomista T-Onlinen sivustossa ja luo salasana sähköpostin POP3-käyttöä varten."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Yritys"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Tiliä ei voitu luoda. Yritä uudelleen."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Sähköposti"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Ottaa käyttöön palvelinten määrittämät suojauskäytännöt"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Asetukset"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Yleiset asetukset"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Vahvista ennen poistamista"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Vahvista ennen lähettämistä"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Hae sähköpostista"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Älä salli laitteen kameran käyttöä"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Vaadi laitteen salasana"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Rajoita viim. salasanojen uud.käyttöä"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Kuulostaa hyvältä!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Luen tämän myöhemmin ja palaan asiaan."</string>
     <string name="quick_4" msgid="216066940197616025">"Järjestetään tapaaminen ja keskustellaan asiasta."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Tämän tilin taustasynkronointi on pois käytöstä roaming-tilassa."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Vastausta lähetetään..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Omat (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Omat (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Ei viestejä."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Kansionvalitsin"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Valitse roskakori tilille <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Valitse lähet. kansio tilille <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Ladataan kansioluetteloa..."</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Ei saatavana"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Kansion synkronointiasetukset"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index a48284f..0676e39 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Accéder aux données du fournisseur de messagerie"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Permet à l\'application d\'accéder à la base de données de votre messagerie, y compris aux messages reçus et envoyés, aux noms d\'utilisateur et aux mots de passe."</string>
     <string name="app_name" msgid="2206468539066258195">"Email"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Déboguer"</string>
     <string name="create_action" msgid="6575946089819721958">"Créer une nouvelle étiquette"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Aucune réponse rapide"</string>
     <string name="account_settings_action" msgid="589969653965674604">"Paramètres de compte"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Problème de connexion."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Déplacer le message"</item>
+    <item quantity="other" msgid="5083310421670206821">"Déplacer des messages"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Les messages ne peuvent pas être déplacés, car cette action n\'est pas compatible avec les comptes POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Impossible de déplacer le message, car la sélection comprend plusieurs comptes."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Impossible de déplacer les messages se trouvant dans les dossiers \"Brouillons\", \"Boîte d\'envoi\" et \"Messages envoyés\"."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Boîte de réception"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Boîte d\'envoi"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Brouillons"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Pourriel"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Messages favoris"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Non lu"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Déboguer"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Boîte de réception"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Marqué d\'une étoile"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Brouillons"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Boîte d\'envoi"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Vue combinée"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Message original --------\nObjet : <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe : <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">"Insérer une réponse rapide"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Insérer une réponse rapide"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Une ou plusieurs pièces jointes au message que vous transférez vont être téléchargées avant l\'envoi."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Impossible de télécharger la pièce jointe."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Une erreur s\'est produite lors du décodage du message."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Impossible de transférer une ou plusieurs pièces jointes."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Pièce jointe non transférée"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Échec de la connexion au compte <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Impossible de se connecter"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> Ko"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> Ko"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Mo"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Mo"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Go"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Go"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Configuration du compte"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Demande d\'autorisation"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Connexion"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Saisissez une adresse de courriel et un mot de passe corrects."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Dupliquer le compte"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Vous utilisez déjà ce nom d\'utilisateur pour le compte \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Ce mot de passe débute ou se termine par un ou plusieurs espaces. De nombreux serveurs n\'acceptent pas les mots de passe contenant des espaces."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Récupération des informations sur le compte…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Validation des paramètres du serveur en cours…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Validation des paramètres SMTP en cours…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Création du compte en cours…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Confirmer le type de compte"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Vous avez indiqué que <xliff:g id="EMAIL">%1$s</xliff:g> utilise <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, mais il est possible que le compte utilise <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Configuration du compte"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Votre compte est configuré et votre messagerie est activée!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Donner un nom à ce compte (facultatif)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Votre nom (affiché sur les messages sortants)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Ce champ est obligatoire."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Configuration du compte"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Type de compte"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"De quel type de compte s\'agit-il?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Configuration du compte"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Paramètres du serveur entrant"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NOM D\'UTILISATEUR"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"MOT DE PASSE"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Lorsque je supprime des messages de la boîte de réception"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Préfixe du chemin IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Facultatif"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Configuration du compte"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Paramètres du serveur sortant"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVEUR SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TYPE DE SÉCURITÉ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Exiger une connexion"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NOM D\'UTILISATEUR"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"MOT DE PASSE"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFICAT CLIENT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Sélectionner"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Utiliser un certificat client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Supprimer"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Aucun"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"IDENTIFIANT D\'APPAREIL MOBILE"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Paramètres de compte"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Options de compte"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Fréquence de synchronisation :"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Jamais"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Tous"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Utiliser param. par défaut"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Nom d\'utilisateur ou mot de passe incorrect."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Échec de la connexion.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Erreur dans la configuration du compte"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Confirmez que le nom d\'utilisateur, le mot de passe et les paramètres du compte sont corrects."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Impossible d\'établir une connexion sécurisée avec le serveur."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Administration de la sécurité à distance"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Vous devez autoriser le serveur <xliff:g id="SERVER">%s</xliff:g> à contrôler à distance certaines fonctionnalités de sécurité de votre mobile Android. Voulez-vous terminer la configuration de ce compte ?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Ce serveur nécessite des fonctionnalités de sécurité incompatibles avec votre appareil Android, dont : <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Vous ne pouvez pas changer le nom d\'utilisateur d\'un compte. Pour ajouter un compte avec un nom d\'utilisateur différent, appuyez sur Ajouter un compte."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"AVERTISSEMENT : Si vous désactivez la gestion de votre appareil par l\'application de courriel, tous les comptes de messagerie qui y sont associés seront supprimés, de même que leurs données (courriels, contacts, événements d\'agenda, etc.)."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Mise à jour de sécurité"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> nécessite la mise à jour de vos paramètres de sécurité."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Mot de passe verrou. expiré"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Les données de <xliff:g id="ACCOUNT">%s</xliff:g> sont en cours d\'effacement de votre appareil. Vous pouvez les restaurer en modifiant le NIP ou le mot de passe de verrouillage de l\'écran. Voulez-vous le modifier maintenant?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Annuler les modifications non enregistrées ?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Impossible de se connecter"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Le nom d\'utilisateur ou le mot de passe de <xliff:g id="ACCOUNT">%s</xliff:g> est incorrect. Voulez-vous les mettre à jour maintenant ?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Échec de la connexion au compte <xliff:g id="ACCOUNT">%s</xliff:g>. Motif donné par le serveur : <xliff:g id="REASON">%s</xliff:g>. Voulez-vous mettre à jour votre nom d\'utilisateur et/ou votre mot de passe?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Télécharger les pièces jointes"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Télécharger automatiquement les pièces jointes aux messages récents via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Notifications par courriel"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synchro événement agenda pour ce compte"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synchr. messagerie"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synchroniser les courriels pour ce compte"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibreur"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibreur"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Sélectionner une sonnerie"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Paramètres du serveur"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Options de synchronisation"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Synchroniser ce dossier"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Tous les messages sont téléchargés lorsque vous vous connectez"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Nombre de jours à synchroniser"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Image de l\'expéditeur"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Seuls certains comptes « Plus » disposent d\'un accès POP permettant à ce programme de se connecter. Si vous ne parvenez pas à vous connecter avec l\'adresse de courriel et le mot de passe corrects, vous ne possédez peut-être pas de compte payant « Plus ». Pour accéder à ces comptes de messagerie, lancez le navigateur Web."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Avant de configurer ce compte de messagerie, consultez le site Web de T-Online et créez un mot de passe d\'accès à la messagerie POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Entreprise"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Impossible de créer le compte. Veuillez réessayer."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Email"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Active les stratégies de sécurité spécifiées par le serveur."</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"paramètres"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Paramètres généraux"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Confirmer avant la suppression"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Confirmer avant l\'envoi"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"&gt;999"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Rechercher le courriel"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Interdire utilisation de l\'appareil photo"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Exiger un mot de passe pour l\'appareil"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Restreindre réutil. mots de passe récents"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Cela me convient."</string>
     <string name="quick_3" msgid="8070999183033184986">"Je lirai cela plus tard, et je vous recontacterai."</string>
     <string name="quick_4" msgid="216066940197616025">"Organisons une réunion pour en discuter."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"La synchronisation en arrière-plan pour ce compte est désactivée en itinérance."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Envoi de la réponse en cours…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personnel (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personnel (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Aucun message"</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Sélecteur de dossier"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Sélect. dossier Corbeille\" du serveur pour <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Sélect. dossier d\'éléments envoyés du serveur pour <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Chargement de la liste des dossiers en cours…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Aucun réponse rapide"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Paramètres de synchronisation de dossier"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e455571..7abbbcb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Accéder aux données du fournisseur de messagerie"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Permet à l\'application d\'accéder à la base de données de votre messagerie, y compris aux messages reçus et envoyés, aux noms d\'utilisateur et aux mots de passe."</string>
     <string name="app_name" msgid="2206468539066258195">"E-mail"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Débogage"</string>
     <string name="create_action" msgid="6575946089819721958">"Créer"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Aucune réponse rapide"</string>
     <string name="account_settings_action" msgid="589969653965674604">"Paramètres du compte"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Problème de connexion."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Déplacer le message"</item>
+    <item quantity="other" msgid="5083310421670206821">"Déplacer des messages"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Les messages ne peuvent pas être déplacés, car cette action n\'est pas compatible avec les comptes POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Impossible de déplacer le message, car la sélection comprend plusieurs comptes."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Impossible de déplacer les messages se trouvant dans les dossiers \"Brouillons\", \"Boîte d\'envoi\" et \"Messages envoyés\"."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Boîte de réception"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Boîte d\'envoi"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Brouillons"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Spam"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Messages suivis"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Non lus"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Débogage"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Boîte de réception"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Suivis"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Brouillons"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Boîte d\'envoi"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Vue combinée"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Message original --------\nObjet : <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe : <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">"Insérer une réponse rapide"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Insérer une réponse rapide"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Une ou plusieurs pièces jointes au message que vous transférez vont être téléchargées avant l\'envoi."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Impossible de télécharger la pièce jointe."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Une erreur s\'est produite lors du décodage du message."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Impossible de transférer une ou plusieurs pièces jointes."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Pièce jointe non transférée"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Échec de la connexion au compte <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Impossible de se connecter"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> Ko"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> Ko"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Mo"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Mo"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Go"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Go"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Configurer un compte"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Demande d\'autorisation en cours"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Connexion"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Saisissez une adresse e-mail et un mot de passe corrects."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Dupliquer le compte"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Vous utilisez déjà ce nom d\'utilisateur pour le compte \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Ce mot de passe débute ou se termine par un ou plusieurs espaces. De nombreux serveurs n\'acceptent pas les mots de passe contenant des espaces."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Récupération des informations sur le compte…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Validation des paramètres du serveur en cours…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Validation des paramètres SMTP en cours…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Création du compte en cours…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Confirmer le type de compte"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Vous avez indiqué que <xliff:g id="EMAIL">%1$s</xliff:g> utilise <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, mais il est possible que le compte utilise <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Configuration du compte"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Votre compte est configuré et votre messagerie est activée !"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Nom du compte (facultatif)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Votre nom (affiché sur les messages sortants)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Ce champ est obligatoire."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Configuration du compte"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Type de compte"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"De quel type de compte s\'agit-il ?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Configuration du compte"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Paramètres du serveur entrant"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NOM D\'UTILISATEUR"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"MOT DE PASSE"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Si messages suppr. de boîte de récep."</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Préfixe du chemin IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Facultatif"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Configuration du compte"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Paramètres du serveur sortant"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVEUR SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TYPE DE SÉCURITÉ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Exiger une connexion"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NOM D\'UTILISATEUR"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"MOT DE PASSE"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFICAT CLIENT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Sélectionner"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Utiliser un certificat client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Supprimer"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Aucun"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"IDENTIFIANT D\'APPAREIL MOBILE"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Paramètres du compte"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Options de compte"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Fréquence de synchronisation :"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Jamais"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Toujours"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Utiliser paramètre par défaut"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Nom d\'utilisateur ou mot de passe incorrect."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Échec de la connexion.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problème de configuration du compte"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Veuillez confirmer que le nom d\'utilisateur, le mot de passe et les paramètres du compte sont corrects."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Impossible d\'établir une connexion sécurisée avec le serveur."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Administration de la sécurité à distance"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Vous devez autoriser le serveur <xliff:g id="SERVER">%s</xliff:g> à contrôler à distance certaines fonctionnalités de sécurité de votre appareil Android. Voulez-vous terminer la configuration de ce compte ?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Ce serveur nécessite des fonctionnalités de sécurité incompatibles avec votre appareil Android, dont : <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Vous ne pouvez pas modifier le nom d\'utilisateur d\'un compte. Pour ajouter un compte associé à un autre nom d\'utilisateur, appuyez sur \"Ajouter un compte\"."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"AVERTISSEMENT : Si vous désactivez la gestion de votre appareil par l\'application E-mail, tous les comptes de messagerie qui y sont associés seront supprimés, de même que leurs données (e-mails, contacts, événements d\'agenda, etc.)."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Mise à jour de sécurité"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> nécessite la mise à jour de vos paramètres de sécurité."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Le mot de passe de verrouillage de votre écran a expiré."</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Les données de <xliff:g id="ACCOUNT">%s</xliff:g> sont en cours d\'effacement de votre appareil. Vous pouvez les restaurer en modifiant le code PIN ou le mot de passe de verrouillage de l\'écran. Voulez-vous le modifier maintenant ?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Annuler les modifications non enregistrées ?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Impossible de se connecter."</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Le nom d\'utilisateur ou le mot de passe de <xliff:g id="ACCOUNT">%s</xliff:g> est incorrect. Voulez-vous les mettre à jour maintenant ?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Échec de la connexion au compte <xliff:g id="ACCOUNT">%s</xliff:g>. Motif donné par le serveur : <xliff:g id="REASON">%s</xliff:g>. Voulez-vous mettre à jour votre nom d\'utilisateur et/ou votre mot de passe ?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Télécharger les pièces jointes"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Téléch. auto des pièces jointes aux messages récents via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Notifications"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synchro événement agenda pour ce compte"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synchr. messagerie"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synchroniser les e-mails pour ce compte"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibreur"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibreur"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Sélectionner une sonnerie"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Paramètres du serveur"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Options de synchronisation"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Synchroniser ce dossier"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Tous les messages sont téléchargés lorsque vous vous connectez"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Synchroniser depuis"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Image de l\'expéditeur"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Seuls certains comptes \"Plus\" disposent d\'un accès POP permettant à ce programme de se connecter. Si vous ne parvenez pas à vous connecter avec l\'adresse e-mail et le mot de passe corrects, vous ne possédez peut-être pas de compte payant \"Plus\". Pour accéder à ces comptes de messagerie, lancez le navigateur Web."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Avant de configurer ce compte de messagerie, consultez le site Web de T-Online et créez un mot de passe d\'accès à la messagerie POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Entreprise"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Impossible de créer le compte. Veuillez réessayer."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-mail"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Active les stratégies de sécurité spécifiées par le serveur."</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Paramètres"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Paramètres généraux"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Confirmer avant suppression"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Confirmer avant envoi"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"&gt; 999"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Rechercher l\'e-mail"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Interdire utilisation de l\'appareil photo"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Exiger un mot de passe pour l\'appareil"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Restreindre réutil. mots de passe récents"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Cela me convient."</string>
     <string name="quick_3" msgid="8070999183033184986">"Je lirai cela plus tard, et je vous recontacterai."</string>
     <string name="quick_4" msgid="216066940197616025">"Organisons une réunion pour en discuter."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"La synchronisation en arrière-plan pour ce compte est désactivée en itinérance."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Envoi de la réponse en cours…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personnel (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personnel (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Aucun message"</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Sélecteur de dossier"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Sélect. dossier \"Corbeille\" du serveur pour <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Sélect. dossier d\'éléments envoyés du serveur pour <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Chargement de la liste des dossiers en cours…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Aucune disponible"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Paramètres de synchronisation des dossiers"</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
deleted file mode 100644
index 2b1a954..0000000
--- a/res/values-gl-rES/strings.xml
+++ /dev/null
@@ -1,296 +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">"Ler anexos de correo electrónico"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"Permite á aplicación ler os teus anexos de correo electrónico."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"Acceso aos datos do fornecedor de correo electrónico"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"Permite á aplicación acceder á base de datos do correo electrónico, incluídas as mensaxes recibidas, as mensaxes enviadas, os nomes de usuario e os contrasinais."</string>
-    <string name="app_name" msgid="2206468539066258195">"Correo electrónico"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Depuración"</string>
-    <string name="create_action" msgid="6575946089819721958">"Crear nova"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"Non hai respostas rápidas."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"Configuración da conta"</string>
-    <string name="status_network_error" msgid="526826323872477973">"Problema de conexión"</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"Mover mensaxe"</item>
-    <item quantity="other" msgid="5083310421670206821">"Mover mensaxes"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"A operación de mover non é compatible con contas POP3."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Non se pode mover porque a selección contén varias contas."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"As mensaxes que están en Borradores, Caixa de saída e Enviados non se poden mover."</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Caixa de entrada"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Caixa de saída"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Borradores"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"Papeleira"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"Enviadas"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Spam"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Marcados con estrela"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Non lido"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Caixa de entrada"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Marcados con estrela"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Borradores"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Caixa de saída"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Vista combinada"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Mensaxe orixinal --------\nAsunto: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe: <xliff:g id="SENDER">%2$s</xliff:g>\nPara: <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">"Inserir resposta rápida"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Inserir resposta rápida"</string>
-    <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Un ou máis anexos da mensaxe reenviada descargaranse antes de realizar o envío."</string>
-    <string name="attachment_not_found" msgid="5219773045406833000">"Non se puido descargar o anexo."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"Produciuse un erro durante a descodificación da mensaxe."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Non se puideron reenviar un ou máis anexos."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"Anexo non reenviado"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"Inicio de sesión en <xliff:g id="ACCOUNT_NAME">%s</xliff:g> incorrecto."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"Non se puido iniciar sesión"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"Configuración da conta"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"Solicitando autorización"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"Iniciar sesión"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"Non se pode autenticar"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"O enderezo de correo electrónico ou o contrasinal non son correctos"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"Enderezo de correo electrónico:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"Conta de correo electrónico"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"Podes configurar a túa conta en poucos pasos."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"Enderezo de correo electrónico"</string>
-    <string name="or_label" msgid="6408695162723653446">"OU"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Iniciar sesión con Google"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"CONTRASINAL"</string>
-    <string name="password_hint" msgid="4226682910292828279">"Contrasinal"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"Iniciaches sesión con %s"</string>
-    <string name="authentication_label" msgid="914463525214987772">"AUTENTICACIÓN"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"Engadir autenticación"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"Borrar autenticación"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"Configuración manual"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Escribe un enderezo de correo electrónico e un contrasinal válidos."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Duplicar conta"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Xa estás usando este nome de usuario para a conta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"Este contrasinal comeza ou remata por un ou máis caracteres de espazo. Moitos servidores non admiten contrasinais con espazos."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Recuperando información da conta..."</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Validando a configuración do servidor..."</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Validando configuración de smtp..."</string>
-    <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Creando conta..."</string>
-    <string name="account_setup_ab_headline" msgid="1434091698882290052">"Confirmar tipo de conta"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Indicaches que <xliff:g id="EMAIL">%1$s</xliff:g> utiliza <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, pero é posible que a conta utilice <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
-    <string name="account_setup_names_title" msgid="8780121351085082269">"Configuración da conta"</string>
-    <string name="account_setup_names_headline" msgid="2031978210683887370">"A túa conta está configurada e en breve recibirás o correo."</string>
-    <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Asigna un nome a esta conta (opcional)"</string>
-    <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"O teu nome (mostrado nas mensaxes saíntes)"</string>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Este campo non pode quedar baleiro."</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Configuración da conta"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Tipo de conta"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"De que tipo de conta se trata?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Configuración da conta"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Configuración do servidor entrante"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NOME DE USUARIO"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"CONTRASINAL"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"Contrasinal"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"SERVIDOR"</string>
-    <string name="account_setup_incoming_port_label" msgid="402562424498833560">"PORTO"</string>
-    <string name="account_setup_incoming_security_label" msgid="8360505617331971663">"TIPO DE SEGURANZA"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="2461510827337484818">"Ningún"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="2834386066577239560">"SSL/TLS (acéptanse todos os certificados)"</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 (acepta todos os certificados)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="3892291833944170882">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="2341742235654301690">"Eliminar correo electrónico do servidor"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="5777530843489961009">"Nunca"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Cando elimino correo electrónico da caixa de entrada"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Prefixo de ruta IMAP"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Opcional"</string>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Configuración da conta"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Configuración do servidor saínte"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVIDOR SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORTO"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TIPO DE SEGURANZA"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Solicitar inicio de sesión"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NOME DE USUARIO"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"CONTRASINAL"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFICADO DE CLIENTE"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Seleccionar"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Usar certificado de cliente"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Eliminar"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Ningún"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID DE DISPOSITIVO MÓBIL"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"Configuración da conta"</string>
-    <string name="account_setup_options_headline" msgid="4810292194395251968">"Opcións de conta"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Frecuencia da sincronización:"</string>
-    <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nunca"</string>
-    <string name="account_setup_options_mail_check_frequency_push" msgid="5511415696925307797">"Automática (push)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="8929785860545198867">"Cada 5 minutos"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="8787901333816702849">"Cada 10 minutos"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"Cada 15 minutos"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"Cada 30 minutos"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"Cada hora"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"Enviarme unha notificación cando chegue un correo electrónico"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="5029046373980454714">"Sincronizar os contactos desde esta conta"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="303441956432308807">"Sincronizar o calendario desde esta conta"</string>
-    <string name="account_setup_options_sync_email_label" msgid="468957966555663131">"Sincronizar o correo electrónico desde esta conta"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="4085327585082867216">"Descargar anexos automaticamente cando te conectes á wifi"</string>
-    <string name="account_setup_failed_dlg_title" msgid="7923577224474005464">"Non se puido completar a configuración"</string>
-    <string name="account_setup_options_mail_window_label" msgid="4737241149297585368">"Sincronizar correos electrónicos de:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="7407981634952005775">"Automática"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"Último día"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"Últimos tres días"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"A semana pasada"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"Últimas dúas semanas"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="3228265299330513816">"O mes pasado"</string>
-    <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Todo"</string>
-    <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Usar valores predeterminados da conta"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"O nome de usuario ou o contrasinal son incorrectos."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Erro de inicio de sesión.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problema coa configuración da conta"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Confirma que o nome de usuario, o contrasinal e a configuración da conta sexan correctos."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Non se pode conectar de forma segura ao servidor."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"Non se pode conectar de forma segura ao servidor.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="4607859382193244795">"É necesario un certificado de cliente. Queres conectarte ao servidor cun certificado de cliente?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="4574461885959029072">"O certificado non é válido ou non se pode acceder a el."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="430054384233036305">"O servidor respondeu cun erro. Comproba o teu nome de usuario e contrasinal e, a continuación, téntao de novo."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="1180197172141077524">"Non se pode conectar ao servidor."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="3889441611138037320">"Non se pode conectar co servidor.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_tls_required" msgid="1902309158359287958">"TLS é necesario, pero non é compatible co servidor."</string>
-    <string name="account_setup_failed_auth_required" msgid="2684010997018901707">"Os métodos de autenticación non son compatibles co servidor."</string>
-    <string name="account_setup_failed_security" msgid="1627240499907011040">"Non se puido abrir a conexión co servidor debido a un erro de seguranza."</string>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"Non se puido abrir a conexión co servidor."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"Escribiches un enderezo de servidor incorrecto ou o servidor require unha versión de protocolo que o correo electrónico non admite."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"Non tes permiso para sincronizar con este servidor. Ponte en contacto co administrador do servidor para obter máis información."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"Administración de seguranza remota"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"É necesario que permitas que o servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota certas funcións de seguranza do dispositivo Android. Queres acabar de configurar esta conta?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Este servidor require funcións de seguranza que o teu dispositivo Android non admite, incluídas: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Non se pode cambiar o nome de usuario dunha conta. Para engadir unha conta cun nome de usuario diferente, toca Engadir conta."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"ADVERTENCIA: A desactivación do permiso da aplicación de correo electrónico para administrar o teu dispositivo eliminará todas as contas de correo electrónico que o requiren, xunto co seu correo electrónico, os contactos, os eventos do calendario e outros datos."</string>
-    <string name="account_security_dialog_title" msgid="7003032393805438164">"Actualización de seguranza"</string>
-    <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> require actualizar a configuración de seguranza."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="3249185558872836884">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" non se pode sincronizar debido aos requisitos de seguranza."</string>
-    <string name="security_needed_ticker_fmt" msgid="7099561996532829229">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" require unha actualización da configuración de seguranza."</string>
-    <string name="security_changed_ticker_fmt" msgid="3823930420292838192">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" cambiou a súa configuración de seguranza; non se require ningunha acción por parte do usuario."</string>
-    <string name="security_notification_content_update_title" msgid="6321099538307807621">"Actual. seguranza obrigatoria"</string>
-    <string name="security_notification_content_change_title" msgid="615639963487448183">"Variaron as políticas de seguranza"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"Non se cumpren polít. segur."</string>
-    <string name="account_security_title" msgid="6072273231606918870">"Seguranza do dispositivo"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="2527501853520160827">"É necesario que permitas que o servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota certas funcións de seguranza do dispositivo Android."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="8155332642922842729">"Editar detalles"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="5543005790538884060">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" require que cambies o contrasinal ou o PIN da pantalla de bloqueo."</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"Contrasinal bloqueo caduca"</string>
-    <string name="password_expired_ticker" msgid="3098703963402347483">"O contrasinal ou o PIN da pantalla de bloqueo caducou."</string>
-    <string name="password_expired_content_title" msgid="7379094218699681984">"Contrasinal bloqueo caducado"</string>
-    <string name="password_expire_warning_dialog_title" msgid="4901499545146045672">"Contrasinal pantalla bloqueo vai caducar"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="1093389293050776319">"Tes que cambiar o contrasinal ou PIN da pantalla de bloqueo en breve, do contrario borraranse os datos de <xliff:g id="ACCOUNT">%s</xliff:g>. Queres cambialo agora?"</string>
-    <string name="password_expired_dialog_title" msgid="7275534155170185252">"Contrasinal da pantalla bloqueo caducado"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Os datos de <xliff:g id="ACCOUNT">%s</xliff:g> estanse borrando do teu dispositivo. Podes restauralos cambiando o contrasinal ou o PIN ou da pantalla de bloqueo. Queres cambialo agora?"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Descartar os cambios non gardados?"</string>
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Non se puido iniciar sesión"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"O nome de usuario ou o contrasinal de <xliff:g id="ACCOUNT">%s</xliff:g> non son correctos. Queres actualizalos agora?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Erro no inicio de sesión de <xliff:g id="ACCOUNT">%s</xliff:g>; o servidor indicou: <xliff:g id="REASON">%s</xliff:g> Queres actualizar o teu nome de usuario e/ou contrasinal?"</string>
-    <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Descargar anexos"</string>
-    <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Descarga automaticamente anexos de mensaxes recentes por wifi"</string>
-    <string name="account_settings_notify_label" msgid="8621226576645167987">"Notificacións por correo electrónico"</string>
-    <string name="account_settings_summary" msgid="4733776978291376161">"Frecuencia da sincronización, notificacións, etc."</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"Envía unha notificación cando se recibe un correo electrónico"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"Frecuencia de sincronización"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"Configuración de entrada"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"Nome usuario, contrasinal e axustes do servidor de entrada"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"Configuración de saída"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"Nome usuario, contrasinal e outros axustes do servidor de saída"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"Políticas aplicadas"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"Ningún"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"Políticas non compatibles"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"Ningún"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"Intentar a sincronización"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"Toca aquí para sincronizar esta conta"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"Nome da conta"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"O teu nome"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"Respostas rápidas"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"Edita texto que acostumas utilizar nos teus correos"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"Configuración das notificacións"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"Uso de datos"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"Políticas de seguranza"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"Cartafoles do sistema"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"Cartafol da papeleira"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"Selecciona o cartafol da papeleira do servidor"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"Selecciona o cartafol da papeleira do servidor"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"Cartafol de elementos enviados"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"Selecciona o cartafol de elementos enviados do servidor"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"Selecciona o cartafol de elementos enviados do servidor"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"Resposta rápida"</string>
-    <string name="save_action" msgid="5740359453077441466">"Gardar"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"Sincron. contactos"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"Sincroniza contactos para a conta"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"Sincron. calendario"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sincroniza o evento do calendario para esta conta"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronizar correo"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincroniza correo para esta conta"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrar"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"Seleccionar ton de chamada"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"Configuración do servidor"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opcións de sincronización"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"Opcións de sincronización (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sincronizar este cartafol"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"As mensaxes descargaranse cando esteas conectado"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Días para sincronizar correo"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Imaxe do remitente"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"Unicamente algunhas contas \"Plus\" inclúen o acceso POP que permite a conexión deste programa. Se non es capaz de iniciar sesión co enderezo de correo electrónico e o contrasinal correctos, é posible que non dispoñas dunha conta \"Plus\" de pago. Inicia o navegador web para obter acceso a estas contas de correo electrónico."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"Antes de configurar esta conta de correo electrónico, visita o sitio web de T-Online e crea un contrasinal para acceder ao correo electrónico POP3."</string>
-    <string name="exchange_name" msgid="3793803477985438102">"Corporativa"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"Non se puido crear a conta. Téntao de novo."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"Correo electrónico"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"Permite políticas de seguranza especificadas polo servidor"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"Configuración"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"Configuración xeral"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Confirmar antes de eliminar"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Confirmar antes de enviar"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"Busca correo electrónico"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Non permitir o uso da cámara do dispositivo"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"Requirir contrasinal do dispositivo"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"Restrinxir reutilización de contrasinais recentes"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"Requirir que os contrasinais caduquen"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"Dispositivo inactivo necesario para bloqueo"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"Limita os eventos do calendario sincronizados"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"Limitar número correos electrónicos sincronizados"</string>
-    <string name="quick_1" msgid="9130521670178673190">"Grazas!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"A min paréceme ben."</string>
-    <string name="quick_3" msgid="8070999183033184986">"Lereino máis tarde e responderei."</string>
-    <string name="quick_4" msgid="216066940197616025">"Organicemos unha reunión para tratar este tema."</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"A sincronización en segundo plano para esta conta está desactivada durante a itinerancia."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"Enviando resposta..."</string>
-    <string name="no_conversations" msgid="3785854971159919343">"Non hai mensaxes."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"Selector de cartafol"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"Selecciona o cartafol da papeleira do servidor para <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"Seleccionar cartafol para <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Cargando lista de cartafoles..."</string>
-    <string name="no_quick_responses" msgid="8716297053803961304">"Ningunha dispoñible"</string>
-    <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Configuración de sincronización de cartafoles"</string>
-</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
deleted file mode 100644
index c7d08d8..0000000
--- a/res/values-hi/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">"ईमेल अटैचमेंट पढ़ें"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"ऐप्स  को आपके ईमेल अटैचमेंट पढ़ने देता है."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"ईमेल प्रदाता के डेटा तक पहुंचें"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"इस ऐप्स को प्राप्‍त संदेशों, भेजे गए संदेशों, उपयोगकर्ता नाम और पासवर्ड सहित आपके ईमेल डेटाबेस में पहुंच देता है."</string>
-    <string name="app_name" msgid="2206468539066258195">"ईमेल"</string>
-    <string name="create_action" msgid="6575946089819721958">"नया बनाएं"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"कोई झटपट उत्तर नहीं."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"खाता सेटिंग"</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"इनबॉक्स"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"आउट-बॉक्स"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"अधूरा ईमेल"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"मिटाया हुआ"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"भेजा गया"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"जंक"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"तारांकित"</string>
-    <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>\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>
-    <string name="message_decode_error" msgid="91396461771444300">"संदेश डीकोड करते समय कोई त्रुटि आई थी."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"एक या अधिक अटैचमेंट अग्रेषित नहीं किए जा सके."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"अटैचमेंट अग्रेषित नहीं किया गया"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> में प्रवेश करना विफल रहा."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"प्रवेश नहीं हो सका"</string>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"खाता सेटअप"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"प्रमाणीकरण का अनुरोध किया जा रहा है"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"प्रवेश करें"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"प्रमाणीकृत करने में असमर्थ"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"ईमेल पता या पासवर्ड गलत है"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"ईमेल पता:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"ईमेल खाता"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"आप बस कुछ ही चरणों में अपना खाता सेट कर सकते हैं."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"ईमेल पता"</string>
-    <string name="or_label" msgid="6408695162723653446">"या"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google से प्रवेश करें"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"पासवर्ड"</string>
-    <string name="password_hint" msgid="4226682910292828279">"पासवर्ड"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s के साथ प्रवेश किया"</string>
-    <string name="authentication_label" msgid="914463525214987772">"प्रमाणीकरण"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"प्रमाणीकरण जोड़ें"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"प्रमाणीकरण साफ़ करें"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"मैन्‍युअल सेटअप"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"कोई मान्‍य ईमेल पता और पासवर्ड लिखें."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"डुप्‍लिकेट खाता"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"आप पहले से ही \"<xliff:g id="DUPLICATE">%s</xliff:g>\" खाते के लिए इस उपयोगकर्ता नाम का उपयोग कर रहे हैं."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"खाता जानकारी पुनर्प्राप्त कर रहा है…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"सर्वर सेटिंग सत्यापित की जा रही हैं…"</string>
-    <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_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>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"खाता प्रकार"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"यह किस प्रकार का खाता है?"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"इनकमिंग सर्वर सेटिंग"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"उपयोगकर्ता नाम"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"पासवर्ड"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"पासवर्ड"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"सर्वर"</string>
-    <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_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>
-    <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_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>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"आउटगोइंग सर्वर सेटिंग"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP सर्वर"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"पोर्ट"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"सुरक्षा प्रकार"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"प्रवेश आवश्यक"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"उपयोगकर्ता नाम"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"क्लाइंट प्रमाणपत्र"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"चुनें"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"क्लाइंट प्रमाणपत्र का उपयोग करें"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"निकालें"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"कोई नहीं"</string>
-    <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_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>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"प्रत्‍येक 15 मिनट"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"प्रत्‍येक 30 मिनट"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"प्रत्‍येक घंटा"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"ईमेल आने पर मुझे सूचित करें"</string>
-    <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_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>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"अंतिम दिन"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"पिछले तीन दिन"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"पिछले सप्ताह"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"पिछले दो सप्ताह"</string>
-    <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_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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"सर्वर से सुरक्षित रूप से कनेक्‍ट नहीं हो सकता.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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_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>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"सर्वर से कनेक्शन खोला नहीं जा सका."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"आपने गलत सर्वर पता लिखा है या सर्वर को उस प्रोटोकॉल वर्शन की आवश्‍यकता है जिसका समर्थन ईमेल नहीं करता."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"आपको इस सर्वर के साथ समन्वयित करने की अनुमति नहीं है. अधिक जानकारी के लिए अपने सर्वर के व्यवस्थापक से संपर्क करें."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"दूरस्‍थ सुरक्षा व्यवस्थापन"</string>
-    <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_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_change_title" msgid="615639963487448183">"सुरक्षा नीतियां बदल दी गई हैं"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"सुरक्षा नीतियां पूरी नहीं हो सकतीं"</string>
-    <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_content_title" msgid="4360288708739366810">"स्‍क्रीन लॉक करें पासवर्ड समाप्त होने वाला है"</string>
-    <string name="password_expired_ticker" msgid="3098703963402347483">"आपकी स्‍क्रीन लॉक करें पिन या पासवर्ड की समय-सीमा समाप्त हो गई है."</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_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_background_attachments_label" msgid="3552681465680701047">"अटैचमेंट को डाउनलोड करें"</string>
-    <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"WiFi के माध्यम से हाल के संदेशों के अटैचमेंट स्वत: डाउनलोड करें"</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>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"समन्वयन आवृत्ति"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"इनकमिंग सेटिंग"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"उपयोगकर्ता नाम, पासवर्ड, और अन्‍य इनकमिंग सर्वर सेटिंग"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"आउटगोइंग सेटिंग"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"उपयोगकर्ता नाम, पासवर्ड, और अन्‍य आउटगोइंग सर्वर सेटिंग"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"नीतियां लागू की गईं"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"कोई नहीं"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"असमर्थित नीतियां"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"कोई नहीं"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"समन्‍वयन का प्रयास करें"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"इस खाते को समन्वयित करने के लिए यहां स्पर्श करें"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"खाता नाम"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"आपका नाम"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"झटपट उत्तर"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"वह लेख संपादित करें जिसे आप अक्सर ईमेल लिखते समय शामिल करते हैं"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"सूचना सेटिंग"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"डेटा उपयोग"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"सुरक्षा नीतियां"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"सिस्टम फ़ोल्डर"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"मिटाया हुआ फ़ोल्डर"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"अपने सर्वर का मिटाया हुआ फ़ोल्डर चुनें"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"अपने सर्वर का मिटाया हुआ फ़ोल्डर चुनें"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"भेजे गए आइटम फ़ोल्डर"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"अपने सर्वर का भेजे गए आइटम फ़ोल्डर चुनें"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"अपने सर्वर का भेजे गए आइटम फ़ोल्डर चुनें"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"झटपट उत्तर"</string>
-    <string name="save_action" msgid="5740359453077441466">"सहेजें"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"संपर्कों को समन्वयन करें"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"इस खाते के लिए संपर्क समन्वयन करें"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"कैलेंडर समन्वयन करें"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"इस खाता के लिए कैलें. इवेंट समन्व. करें"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ईमेल समन्‍वयित करें"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"इस खाते के लिए ईमेल समन्वयन करें"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"कंपन"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"रिंगटोन चुनें"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"सर्वर सेटिंग"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"समन्वयन विकल्‍प"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"समन्वयन विकल्प (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"यह फ़ोल्डर समन्वयित करें"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"कनेक्ट होने पर संदेश डाउनलोड हो जाएंगे"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"इतने दिनों के मेल समन्वयित करें"</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"यह ईमेल खाता सेट करने से पहले, T-Online वेबसाइट पर जाएं और POP3 ईमेल पहुंच के लिए पासवर्ड बनाएं."</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"खाता नहीं बनाया जा सका. पुन: प्रयास करें."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"ईमेल"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"सर्वर-विशिष्ट सुरक्षा नीतियों को सक्षम करता है"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"डिवाइस के कैमरे के उपयोग की अनुमति न दें"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"डिवाइस पासवर्ड आवश्‍यक"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"हाल के पासवर्ड का पुन: उपयोग प्रतिबं. करें"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"पासवर्ड के लिए समय सीमा समाप्ति आवश्यक"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"स्क्रीन लॉक के लिए प्रयोग में नहीं डिवाइस चाहिए"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"समन्‍वयित कैलेंडर ईवेंट की संख्‍या सीमित करें"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"समन्‍वयित ईमेल की संख्‍या सीमित करें"</string>
-    <string name="quick_1" msgid="9130521670178673190">"धन्यवाद!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"मुझे अच्छा लगता है!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"मैं इसे बाद में पढ़ूंगा/पढ़ूगी और आपसे संपर्क करूंगा/करूंगी."</string>
-    <string name="quick_4" msgid="216066940197616025">"आइए इस पर चर्चा करने के लिए कोई मीटिंग सेट करें."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"प्रतिक्रिया भेज रहा है..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"निजी (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"निजी (POP3)"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> का सर्वर मिटाया हुआ फ़ोल्डर चुनें"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> के लिए सर्वर प्रेषित आइटम फ़ोल्डर चुनें"</string>
-    <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>
-</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index df0aa24..ab30865 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Pristup podacima o davatelju usluge e-pošte"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Aplikaciji omogućuje pristup podatkovnoj bazi vaše e-pošte, uključujući primljene poruke, poslane poruke, korisnička imena i zaporke."</string>
     <string name="app_name" msgid="2206468539066258195">"E-pošta"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Otklanjanje pogrešaka"</string>
     <string name="create_action" msgid="6575946089819721958">"Izradi novi"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Nema brzih odgovora."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Postavke računa"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Problem s vezom."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Premjesti poruku"</item>
+    <item quantity="other" msgid="5083310421670206821">"Premjesti poruke"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Premještanje nije podržano na računima POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Premještanje nije moguće jer odabir sadrži više računa."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Poruke u mapama Nacrti, Izlazni spremnik i Poslano ne mogu se premjestiti."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Pristigla pošta"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Izlazna pošta"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Skice"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Smeće"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Označeno zvjezdicom"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Nepročitano"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Otklanjanje pogrešaka"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Pristigla pošta"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Sa zvjezdicom"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Skice"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Izlazna pošta"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Kombinirani prikaz"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Izvorna poruka --------\nPredmet: <xliff:g id="SUBJECT">%1$s</xliff:g>\nŠalje: <xliff:g id="SENDER">%2$s</xliff:g>\nPrima: <xliff:g id="TO">%3$s</xliff:g>\nKopija: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Umetanje brzog odgovora"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Umetni brzi odgovor"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Jedan ili više privitaka u proslijeđenoj poruci preuzet će se prije slanja."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Preuzimanje privitka nije uspjelo."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Došlo je do pogreške prilikom dekodiranja poruke."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Jedan ili više privitaka nije bilo moguće proslijediti."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Privitak nije proslijeđen"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Prijava računa <xliff:g id="ACCOUNT_NAME">%s</xliff:g> neuspješna."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Neuspjela prijava"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Postavljanje računa"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Zahtijevanje autorizacije"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Prijava"</string>
@@ -61,20 +90,25 @@
     <string name="add_authentication_label" msgid="382998197798081729">"Dodavanje autentifikacije"</string>
     <string name="clear_authentication_label" msgid="4750930803913225689">"Brisanje autentifikacije"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"Ručno postavljanje"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Upišite važeću e-adresu i zaporku."</string>
+    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Upišite važeću adresu e-pošte i zaporku."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Dvostruki račun"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"To korisničko ime već upotrebljavate za račun \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Ova zaporka počinje ili završava jednim ili više znakova razmaka. Mnogi poslužitelji ne podržavaju zaporke s razmacima."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Učitavanje podataka o računu..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Provjeravanje postavki poslužitelja…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Provjeravanje postavki SMPT-a…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Izrada računa…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Potvrda vrste računa"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Naznačili ste da <xliff:g id="EMAIL">%1$s</xliff:g> upotrebljava <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, ali račun možda upotrebljava <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Postavljanje računa"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Vaš je račun postavljen, a e-pošta stiže!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Dodijelite ovom računu naziv (opcionalno)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Vaše ime (prikazano u izlaznim porukama)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Ovo polje ne može biti prazno."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Postavljanje računa"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Vrsta računa"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Koja je ovo vrsta računa?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Postavljanje računa"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Postavke dolaznog poslužitelja"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"KORISNIČKO IME"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ZAPORKA"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Kad izbrišem iz Pristigle pošte"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Prefiks IMAP putanje"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Izborno"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Postavljanje računa"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Postavke odlaznog poslužitelja"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP POSLUŽITELJ"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PRIKLJUČAK"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"VRSTA SIGURNOSTI"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Potrebna je prijava"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"KORISNIČKO IME"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ZAPORKA"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFIKAT KLIJENTA"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Odaberi"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Upotrijebi certifikat klijenta"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Ukloni"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Ništa"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID MOBILNOG UREĐAJA"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Postavke računa"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Mogućnosti računa"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Učestalost sinkronizacije:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nikad"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Sve"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Rabi zadanu post. računa"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Korisničko ime ili zaporka nisu ispravni."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Prijava nije uspjela.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problem s postavljanjem računa"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Potvrdite točnost korisničkog imena, zaporke i postavki računa."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Sigurno povezivanje s poslužiteljem nije moguće."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Sigurnosna administracija na daljinu"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Poslužitelj <xliff:g id="SERVER">%s</xliff:g> zahtijeva da mu omogućite daljinsko upravljanje nekim sigurnosnim značajkama svojeg Android uređaja. Želite li dovršiti postavljanje ovog računa?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Ovaj poslužitelj zahtijeva sigurnosne značajke koje vaš Android uređaj ne podržava, uključujući: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Ne možete promijeniti korisničko ime računa. Da biste dodali račun s nekim drugim korisničkim imenom, dodirnite \"Dodaj račun\"."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"UPOZORENJE: Deaktivacijom ovlasti aplikacije E-pošta za upravljanje uređajem izbrisat će se svi računi e-pošte koji traže tu ovlast, kao i e-pošta, kontakti, događaji kalendara i drugi podaci."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Sigurnosno ažuriranje"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"Račun <xliff:g id="ACCOUNT">%s</xliff:g> zahtijeva da ažurirate svoje sigurnosne postavke."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Istekla zap. za zaklj. zasl."</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Podaci za račun <xliff:g id="ACCOUNT">%s</xliff:g> brišu se s vašeg uređaja. Možete ih vratiti promjenom PIN-a ili zaporke za zaključavanje. Želite li to promijeniti sada?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Odbaciti nespremljene promjene?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Neuspjela prijava"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Netočno je korisničko ime ili zaporka za račun <xliff:g id="ACCOUNT">%s</xliff:g>. Želite li to ažurirati sada?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Nije uspjela vaša prijava na račun <xliff:g id="ACCOUNT">%s</xliff:g>; ovo je poruka poslužitelja: <xliff:g id="REASON">%s</xliff:g> Želite li ažurirati korisničko ime i/ili zaporku?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Preuzimanje privitaka"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Automatsko preuzimanje privitaka uz nedavne poruke Wi-Fi mrežom"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Obavijesti e-pošte"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sink. kal. dog. za ovaj račun"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sink. e-pošte"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sink. e-pošte za ovaj račun"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibracija"</string>
+    <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibracija"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Odaberite melodiju zvona"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Postavke poslužitelja"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opcije sinkronizacije"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sinkroniziraj ovu mapu"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Poruke će se preuzeti prilikom povezivanja"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Broj dana pošte za sinkronizaciju"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Slika pošiljatelja"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Samo neki računi usluge \"Plus\" uključuju POP pristup koji ovom programu omogućuje povezivanje. Ako se ne možete prijaviti sa svojom ispravnom adresom e-pošte i zaporkom, možda nemate plaćeni račun usluge \"Plus\". Pokrenite web-preglednik kako biste dobili pristup tim računima e-pošte."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Prije postavljanja ovog računa e-pošte posjetite web-lokaciju T-Online i stvorite zaporku za POP3 pristup e-pošti."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Korporacijski"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Izrada računa nije uspjela. Pokušajte ponovo."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-pošta"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Omogućuje sigurnosna pravila određena poslužiteljem"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Postavke"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Opće postavke"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Potvrdite prije brisanja"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Potvrdite prije slanja"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Pretraži e-poštu"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Onemogući upotrebu fotoaparata uređaja"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Zahtijevaj zaporku uređaja"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Ograniči ponovnu upotrebu novijih zapor."</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Izvrsno!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Pročitat ću to kasnije i javiti vam se."</string>
     <string name="quick_4" msgid="216066940197616025">"Hajdemo dogovoriti sastanak na kojem ćemo raspraviti o tome."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Pozadinska sinkronizacija za ovaj račun onemogućena je u roamingu."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Slanje odgovora..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Osobni (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Osobni (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Nema poruka."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Alat za odabir mape"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Odaberite mapu za otpad poslužitelja za <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Odaberite mapu za poslane stavke poslužitelja za <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Učitavanje popisa mapa…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Nema dostupnih"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Postavke za sinkronizaciju mape"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 9b21d8f..ee32174 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Hozzáférés az e-mail szolgáltató adataihoz"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Lehetővé teszi az alkalmazás számára az e-mail adatbázisához, így a fogadott és elküldött üzenetekhez, a felhasználónevekhez és jelszavakhoz való hozzáférést."</string>
     <string name="app_name" msgid="2206468539066258195">"E-mail küldése"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Hibakeresés"</string>
     <string name="create_action" msgid="6575946089819721958">"Új létrehozása"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Nincsenek gyors válaszok."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Fiókbeállítások"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Csatlakozási probléma"</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Üzenet áthelyezése"</item>
+    <item quantity="other" msgid="5083310421670206821">"Üzenetek áthelyezése"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Az áthelyezés nem támogatott POP3-fiókokban."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Nem lehet áthelyezni, mert a kijelölés több fiókot tartalmaz."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"A Piszkozatok, Kimenő levelek és Elküldött mappákban lévő üzeneteket nem lehet áthelyezni."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Beérkező levelek"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Kimenő levelek"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Piszkozatok"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Spam"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Megcsillagozva"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Olvasatlan"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Hibakeresés"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Beérkező levelek"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Megcsillagozva"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Piszkozatok"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Kimenő levelek"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Kombinált nézet"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Eredeti üzenet --------\nTárgy: <xliff:g id="SUBJECT">%1$s</xliff:g>\nFeladó: <xliff:g id="SENDER">%2$s</xliff:g>\nCímzett: <xliff:g id="TO">%3$s</xliff:g>\nMásolatot kap: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Gyors válasz beillesztése"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Gyors válasz beillesztése"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Küldés előtt továbbított üzenete egy vagy több melléklete letöltődik."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Nem sikerült letölteni a mellékletet."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Hiba történt az üzenet dekódolása közben."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Egy vagy több melléklet nem továbbítható."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"A melléklet nincs továbbítva"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"A(z) <xliff:g id="ACCOUNT_NAME">%s</xliff:g> fiókba való bejelentkezés sikertelen."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Sikertelen bejelentkezés"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Fiók beállítása"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Engedélyezés kérése"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Bejelentkezés"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Írjon be egy érvényes e-mail címet és jelszót."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Már létező fiók"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Már használja ezt a felhasználónevet a(z) <xliff:g id="DUPLICATE">%s</xliff:g> fiókhoz."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Ez a jelszó egy vagy több szóközzel kezdődik, vagy végződik. Sok szerver nem támogatja a szóközöket a jelszavakban."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Fiókadatok beolvasása…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Szerverbeállítások ellenőrzése…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"SMTP-beállítások ellenőrzése…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Fiók létrehozása…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Fióktípus megerősítése"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Azt jelezte, hogy <xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g> protokollt használ, de lehet, hogy a fiók a következőt használja: <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Fiók beállítása"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"A fiók beállítása befejeződött, az e-mailek úton vannak."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Fiók elnevezése (opcionális)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Az Ön neve (a kimenő üzenetekben való megjelenítéshez)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Ez a mező nem lehet üres."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Fiók beállítása"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Fiók típusa"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Milyen típusú ez a fiók?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Fiók beállítása"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Bejövő üzenetek szerverének beállításai"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"FELHASZNÁLÓNÉV"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"JELSZÓ"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"A Beérkező levelek mappából való törléskor"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP-alapú elérési út előtagja"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Opcionális"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Fiók beállítása"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Kimenő üzenetek szerverének beállításai"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP-SZERVER"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT"</string>
     <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_outgoing_password_label" msgid="112570779839746136">"JELSZÓ"</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>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Nincs"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBILESZKÖZ AZONOSÍTÓJA"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Fiókbeállítások"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Fiókbeállítások"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Szinkronizálás gyakorisága:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Soha"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Mind"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Alapbeállítások szerint"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Helytelen felhasználónév vagy jelszó."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Sikertelen bejelentkezés.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Probléma a fiók beállításával"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Erősítse meg felhasználónevének, jelszavának és fiókbeállításainak helyességét."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Nem lehet biztonságos kapcsolatot létesíteni a szerverrel."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Távoli biztonságkezelés"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"A(z) <xliff:g id="SERVER">%s</xliff:g> szerver engedélyt kér arra, hogy távolról vezérelhesse az Android-eszköz egyes biztonsági funkcióit. Befejezi a fiók konfigurálását?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Ez a szerver olyan biztonsági funkciókat követel meg, amelyeket az Ön Android készüléke nem támogat, például: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"A fiók felhasználónevét nem lehet módosítani. Eltérő nevű fiók hozzáadásához érintse meg a Fiók hozzáadása elemet."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"FIGYELMEZTETÉS: ha kikapcsolja az E-mail alkalmazás azon jogosultságát, hogy felügyelje az eszközt, akkor törli az összes olyan e-mail fiókot, amelyhez szükség van az alkalmazásra; a fiókokkal együtt pedig törli az e-maileket, a névjegyeket, a naptári eseményeket és más adatokat is."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Biztonsági frissítés"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"A(z) <xliff:g id="ACCOUNT">%s</xliff:g> fiók a biztonsági beállítások frissítését igényli."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Képernyőzár jelszava lejárt"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"<xliff:g id="ACCOUNT">%s</xliff:g> adatai törlésre kerülnek a készülékről. Visszaállíthatja a képernyőzár PIN-kódjának vagy jelszavának módosításával. Módosítja most?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Elveti a nem mentett módosításokat?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Sikertelen bejelentkezés"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"A(z) <xliff:g id="ACCOUNT">%s</xliff:g> fiókhoz tartozó felhasználónév és jelszó helytelen. Szeretné frissíteni őket most?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Nem sikerült belépni a(z) <xliff:g id="ACCOUNT">%s</xliff:g> fiókba; a szerver a következő választ küldte: <xliff:g id="REASON">%s</xliff:g>. Szeretné módosítani a felhasználónevet és/vagy a jelszót?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Mellékletek letöltése"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Mellékletek automatikus letöltése az üzenetekbe Wi-Fin keresztül"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"E-mail értesítések"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"A fiók naptárának szinkronizálása"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"E-mail szinkroniz."</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"A fiók e-mailjeinek szinkronizálása"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Rezgés"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Rezgés"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Válasszon csengőhangot"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Szerverbeállítások"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Szinkronizálási beállítások"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Mappa szinkronizálása"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Az üzenetek automatikusan letöltésre kerülnek, amikor létrejön kapcsolat"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Ennyi nap leveleinek szinkronizálása"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Feladó képe"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Csak bizonyos „Plus” típusú fiókok rendelkeznek olyan POP-hozzáféréssel, amely lehetővé teszi a program számára a kapcsolódást. Ha nem tud bejelentkezni a megfelelő e-mail címmel és jelszóval, valószínűleg nem fizetett elő „Plus” típusú fiókra. Az ilyen e-mail fiókok eléréséhez indítsa el a böngészőt."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Kérjük, az e-mail fiók beállítása előtt keresse fel a T-Online webhelyét, és hozzon létre jelszót a POP3-alapú e-mail hozzáféréshez."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Vállalati"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Nem sikerült létrehozni a fiókot. Próbálja újra."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-mail küldése"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Engedélyezi a szerverspecifikus biztonsági irányelveket"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Beállítások"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Általános beállítások"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Megerősítés kérése törlés előtt"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Megerősítés kérése küldés előtt"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"E-mail keresése"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"A kamera használatának tiltása"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Eszközjelszó kötelező"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Előző jelszavak kizárása"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Jól hangzik!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Később elolvasom és visszatérünk rá."</string>
     <string name="quick_4" msgid="216066940197616025">"Szervezzünk egy találkozót a dolog megvitatására."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"A fiók háttérben zajló szinkronizálása le van tiltva barangolás közben."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Válasz küldése…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Személyes (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Személyes (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Nincsenek üzenetek."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Mappaválasztó"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Szerver Kuka mappájának kiválasztása – <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Szerver Elküldött mappájának kiválasztása – <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Mappalista betöltése…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Egyik sem érhető el"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Mappaszinkronizálási beállítások"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 88c5aac..e8f19ff 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Մատչել էլփոստի մատուցողի տվյալները"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Թույլ է տալիս հավելվածին մուտք գործել ձեր էլփոստի տվյալների շտեմարան, այդ թվում` ստացված և ուղարկված հաղորդագրություններ, օգտանուններ և գաղտնաբառեր:"</string>
     <string name="app_name" msgid="2206468539066258195">"Էլփոստ"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Կարգաբերել"</string>
     <string name="create_action" msgid="6575946089819721958">"Ստեղծել նորը"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Արագ պատասխաններ չկան:"</string>
     <string name="account_settings_action" msgid="589969653965674604">"Հաշվի կարգավորումներ"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Միացման խնդիր"</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Տեղափոխել հաղորդագրությունը"</item>
+    <item quantity="other" msgid="5083310421670206821">"Տեղափոխել հաղորդագրությունները"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Տեղափոխումը չի աջակցվում POP3 հաշիվներում:"</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Հնարավոր չէ տեղափոխել, քանի որ ընտրությունը պարունակում բազմակի հաշիվներ:"</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Սևագրեր, Ելից և Ուղարկված թղթապանակների հաղորդագրությունները հնարավոր չէ տեղափոխել:"</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Մուտքի արկղ"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Ելից"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Սևագրեր"</string>
@@ -32,12 +41,16 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Թափոն"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Աստղանշված"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Չընթերցված"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Կարգաբերել"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Մուտքի արկղ"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Աստղանշված"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Սևագրեր"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Ելից"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Հնարավոր չէ ներբեռնել կցորդը:"</string>
     <string name="message_decode_error" msgid="91396461771444300">"Սխալ հաղորդագրությունը ապակոդավորելիս տեղի է ունեցել սխալ:"</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Չհաջողվեց փոխանցել մեկ կամ ավելի կցորդներ:"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Կցորդը չի փոխանցվել"</string>
@@ -66,17 +79,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Մուտքագրեք վավեր էլփոստի հասցե և գաղտնաբառ:"</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Կրկնօրինակել հաշիվը"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Դուք արդեն օգտագործում եք այս օգտանունը «<xliff:g id="DUPLICATE">%s</xliff:g>» հաշվի համար:"</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Այս գաղտնաբառը սկսվում կամ ավարտվում է մեկ կամ մի քանի բացակի նիշով: Շատ սերվերներ չեն աջակցում բացակներով գաղտնաբառեր:"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Առբերվում են հաշվի տեղեկությունները..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Վավերացվում են սերվերի կարգավորումները..."</string>
     <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_names_title" msgid="8780121351085082269">"Հաշվի ստեղծում"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Այս դաշտը չի կարող դատարկ լինել:"</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Հաշվի կարգավորում"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Հաշվի տեսակը"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Ի՞նչ տեսակի հաշիվ է սա"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Հաշվի կարգավորում"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Մուտքային սերվերի կարգավորումներ"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ՕԳՏԱՆՈՒՆ"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ԳԱՂՏՆԱԲԱՌ"</string>
@@ -94,18 +112,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Հաշվի կարգավորում"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Ելքային սերվերի կարգավորումներ"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP ՍԵՐՎԵՐ"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ՄԻԱՑՔ"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ԱՆՎՏԱՆԳՈՒԹՅԱՆ ՏԵՍԱԿԸ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Պահանջում է մուտք գործել"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ՕԳՏԱՆՈՒՆ"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ԳԱՂՏՆԱԲԱՌ"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"ՍՊԱՍԱՌՈՒԻ ՎԿԱՅԱԿԱՆ"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Ընտրել"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Օգտագործել հաճախորդի վկայական"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Հեռացնել"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Ոչ մեկը"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ՇԱՐԺԱԿԱՆ ՍԱՐՔԻ ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Հաշվի կարգավորումներ"</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>
@@ -131,6 +152,7 @@
     <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_fmt" msgid="8811464534757505457">"Մուտքը ձախողվեց:\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -149,6 +171,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Անվտանգության հեռակա կառավարում"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"Դուք չեք կարող փոխել հաշվի օգտանունը: Այլ օգտանունով հաշիվ ավելացնելու համար հպեք «Ավելացնել հաշիվ»:"</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"Զգուշացում. էլփոստի հավելվածի` ձեր սարքը կառավարելու լիազորության ապակտիվացումը կարող է ջնջել էլփոստի բոլոր հաշիվները, որոնք այն պահանջում են` իրենց էլփոստի, կոնտակտների, օրացուցային իրադարձությունների և այլ տվյալների հետ միասին:"</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>
@@ -170,6 +193,9 @@
     <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>-ի տվյալները ջնջվում են ձեր սարքից: Դուք կարող եք այն վերականգնել` փոխելով ձեր էկրանի կողպման PIN-ը կամ գաղտնաբառը: Ցանկանու՞մ եք այն փոխել հիմա:"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Մերժե՞լ չպահված փոփոխությունները"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Հնարավոր չէ մուտք գործել"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g>-ի օգտանունը կամ գաղտնաբառը սխալ է: Ցանկանու՞մ եք թարմացնել դրանք հիմա:"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Ձեր մուտքը <xliff:g id="ACCOUNT">%s</xliff:g> խափանվել է; սերվերը ասում է` <xliff:g id="REASON">%s</xliff:g> Ցանկանու՞մ եք թարմացնել ձեր օգտանունը և/կամ գաղտնաբառը:"</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>
@@ -208,7 +234,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Համաժամեցնել օրացուցային իրադարձությունը այս հաշվում"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Համաժամեցնել էլփոստը"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Համաժամեցնել Էլփոստը այս հաշվում"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Թրթռալ"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Թրթռալ"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Ընտրեք զանգերանգը"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Սերվերի կարգավորումներ"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Համաժամեցման ընտրանքներ"</string>
@@ -216,11 +242,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Համաժամել այս թղթապանակը"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Հաղորդագրությունները կներբեռնվեն միանալուն պես"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Փոստի համաժամեցման օրեր"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Ուղարկողի պատկերը"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Միայն որոշ «Plus» հաշիվներ են ներառում POP մուտք` թույլատրելով այս ծրագրին միանալ: Եթե ​​դուք չեք կարող մուտք գործել ձեր ճիշտ էլփոստի հասցեով և գաղտնաբառով, դուք հնարավոր է չունեք վճարովի «Plus» հաշիվ: Գործարկեք վեբ զննարկիչը` այս էլփոստի հաշիվներ մուտք ստանալու համար:"</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Նախքան այս էլփոստի հաշիվը ստեղծելը խնդրում ենք այցելել T-Online կայքէջը և ստեղծել գաղտնաբառ` POP3 էլփոստի մուտքի համար:"</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Կորպորատիվ"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Չհաջողվեց ստեղծել հաշիվը: Փորձեք կրկին:"</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Էլփոստ"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Միացնում է սերվերին հատուկ անվտանգության քաղաքականությունները"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Կարգավորումներ"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Հիմնական կարգավորումներ"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Հաստատել ջնջելուց առաջ"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Հաստատել նախքան ուղարկելը"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Որոնել նամակ"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Արգելել սարքի տեսախցիկի օգտագործումը"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Պահանջում է սարքի գաղտնաբառը"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Սահմանափակել վերջին գաղտնաբառերի վերօգտագործումը"</string>
@@ -232,13 +267,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Լավ է հնչում:"</string>
     <string name="quick_3" msgid="8070999183033184986">"Ես սա ավելի ուշ կընթերցեմ և կվերադառնամ ձեզ:"</string>
     <string name="quick_4" msgid="216066940197616025">"Եկեք հանդիպում նշանակենք` սա քննարկելու համար:"</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Հետնաշերտի համաժամեցումը անջատված է այս հաշվի համար ռոումինգում գտնվելիս:"</string>
     <string name="confirm_response" msgid="6764021931370809514">"Ուղարկվում է պատասխանը..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Անհատական (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Անհատական (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Հաղորդագրություններ չկան:"</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Թղթապանակի նշիչ"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Ընտրեք սերվերի թափոնի թղթապանակը <xliff:g id="ACCOUNT">%s</xliff:g>-ի համար"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Ընտրեք սերվերի ուղարկած նյութերի թղթապանակը <xliff:g id="ACCOUNT">%s</xliff:g>-ի համար"</string>
     <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>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 693317e..743db66 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Akses data penyedia email"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Mengizinkan apl mengakses basis data email Anda, termasuk pesan yang diterima, pesan yang dikirim, nama pengguna, dan sandi."</string>
     <string name="app_name" msgid="2206468539066258195">"Email"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Debug"</string>
     <string name="create_action" msgid="6575946089819721958">"Buat baru"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Tidak ada tanggapan cepat."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Setelan akun"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Masalah sambungan."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Pindahkan pesan"</item>
+    <item quantity="other" msgid="5083310421670206821">"Pindahkan pesan"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Pemindahan tidak didukung pada akun POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Tidak dapat memindah karena pilihan berisi beberapa akun."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Pesan dalam Draf, Kotak Keluar, dan Terkirim tidak dapat dipindah."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Kotak Masuk"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Kotak Keluar"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Draf"</string>
@@ -32,7 +41,10 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Junk"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Berbintang"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Belum dibaca"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Debug"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Kotak Masuk"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Yang berbintang"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Draf"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Kotak Keluar"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Tampilan kombinasi"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Pesan Asli --------\nSubjek: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDari: <xliff:g id="SENDER">%2$s</xliff:g>\nKepada: <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">"Masukkan tanggapan cepat"</string>
@@ -43,6 +55,22 @@
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Lampiran tidak diteruskan"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Gagal masuk <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Tidak dapat masuk"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Penyiapan akun"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Meminta otorisasi"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Masuk"</string>
@@ -64,17 +92,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Ketik alamat email dan sandi yang valid."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Akun rangkap"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Anda telah menggunakan nama pengguna ini untuk akun \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Sandi ini diawali atau diakhiri dengan satu karakter spasi atau lebih. Banyak server tidak mendukung sandi dengan spasi."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Mengambil informasi akun..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Memvalidasi setelan server…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Memvalidasi setelan smtp…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Membuat akun..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Konfirmasi jenis akun"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Anda menunjukkan bahwa <xliff:g id="EMAIL">%1$s</xliff:g> menggunakan <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, namun akun mungkin menggunakan <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Penyiapan akun"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Akun Anda sudah siap dan email akan segera tiba!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Beri nama akun ini (opsional)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Nama (yang ditampilkan pada pesan keluar)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Bidang ini tidak boleh kosong."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Penyiapan akun"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Jenis akun"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Jenis akun apakah ini?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Penyiapan akun"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Setelan server masuk"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NAMA PENGGUNA"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"SANDI"</string>
@@ -92,18 +125,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Jika saya hapus dari Kotak Masuk"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Awalan jalur IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Opsional"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Penyiapan akun"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Setelan server keluar"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVER SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"JENIS KEAMANAN"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Harus masuk"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NAMA PENGGUNA"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"SANDI"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"SERTIFIKAT KLIEN"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Pilih"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Gunakan sertifikat klien"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Hapus"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Tidak ada"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID PERANGKAT SELULER"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Setelan akun"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Opsi akun"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Frekuensi sinkronisasi:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Tidak pernah"</string>
@@ -129,6 +165,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Semua"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Gunakan default akun"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Nama pengguna atau sandi salah."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Gagal masuk.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Ada masalah dengan penyiapan akun"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Konfirmasi bahwa setelan akun, sandi, dan nama pengguna Anda sudah benar."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Tidak dapat tersambung ke server dengan aman."</string>
@@ -147,6 +184,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Administrasi keamanan jarak jauh"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Server <xliff:g id="SERVER">%s</xliff:g> meminta Anda mengizinkannya mengontrol beberapa fitur keamanan perangkat Android dari jarak jauh. Apakah Anda ingin menyelesaikan penyiapan akun ini?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Server ini memerlukan fitur keamanan yang tidak didukung perangkat Android Anda, termasuk: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Anda tidak dapat mengubah nama pengguna akun. Untuk menambahkan akun dengan nama pengguna lain, sentuh Tambahkan Akun."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"PERINGATAN: Menonaktifkan otoritas apl Email untuk mengatur perangkat Anda akan menghapus semua akun email yang memerlukannya, beserta email, kontak, acara kalender, dan data lainnya."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Pembaruan keamanan"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> mengharuskan Anda memperbarui setelan keamanan."</string>
@@ -154,7 +192,7 @@
     <string name="security_needed_ticker_fmt" msgid="7099561996532829229">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" memerlukan pembaruan setelan keamanan."</string>
     <string name="security_changed_ticker_fmt" msgid="3823930420292838192">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" mengubah setelan keamanannya, tidak diperlukan tindakan pengguna."</string>
     <string name="security_notification_content_update_title" msgid="6321099538307807621">"Diperlukan pembaruan keamanan"</string>
-    <string name="security_notification_content_change_title" msgid="615639963487448183">"Kebijakan keamanan berubah"</string>
+    <string name="security_notification_content_change_title" msgid="615639963487448183">"Kebijakan keamanan tlh diubah"</string>
     <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"Kbijakan keamanan tak terpnuhi"</string>
     <string name="account_security_title" msgid="6072273231606918870">"Keamanan perangkat"</string>
     <string name="account_security_policy_explanation_fmt" msgid="2527501853520160827">"Server <xliff:g id="SERVER">%s</xliff:g> meminta Anda mengizinkannya mengontrol beberapa fitur keamanan perangkat Android dari jarak jauh."</string>
@@ -168,6 +206,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Sandi pengunci layar kedaluwarsa"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Data untuk <xliff:g id="ACCOUNT">%s</xliff:g> sedang dihapus dari perangkat. Anda dapat memulihkannya dengan mengganti PIN atau sandi pengunci layar. Ganti sekarang?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Buang perubahan yang tidak tersimpan?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Tidak dapat masuk"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Nama pengguna atau sandi untuk <xliff:g id="ACCOUNT">%s</xliff:g> salah. Perbarui sekarang?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Anda gagal masuk ke <xliff:g id="ACCOUNT">%s</xliff:g>; server berkata: <xliff:g id="REASON">%s</xliff:g> Anda ingin memperbarui nama pengguna dan/atau sandi?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Unduh lampiran"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Unduh-otomatis lampiran pada pesan terbaru melalui Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Pemberitahuan email"</string>
@@ -206,7 +247,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinkronkan acara kalender akun ini"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sinkronkan email"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sinkronkan email untuk akun ini"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Getar"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Getar"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Pilih nada dering"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Setelan server"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opsi sinkronisasi"</string>
@@ -214,11 +255,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sinkronkan folder ini"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Pesan akan diunduh saat tersambung"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Jumlah hari email yang akan disinkronkan"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Gambar pengirim"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Hanya beberapa akun \"Plus\" termasuk akses POP yang mengizinkan program ini tersambung. Jika tidak dapat masuk dengan sandi dan alamat email yang benar, Anda mungkin tidak memiliki akun \"Plus\" berbayar. Luncurkan browser web untuk mendapat akses ke akun email ini."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Sebelum menyiapkan akun email ini, kunjungi situs web T-Online dan buat sandi untuk akses email POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Perusahaan"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Tidak dapat membuat akun. Coba lagi."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Email"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Mengaktifkan kebijakan keamanan yang ditentukan server"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Setelan"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Setelan umum"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Konfirmasi sebelum hapus"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Konfirmasi sebelum mengirim"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Telusuri email"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Tolak penggunaan kamera perangkat"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Memerlukan sandi perangkat"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Batasi penggunaan ulang sandi terkini"</string>
@@ -230,6 +280,7 @@
     <string name="quick_2" msgid="8611591278119481491">"Menurut saya itu bagus!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Saya akan membaca ini nanti dan mengabari Anda."</string>
     <string name="quick_4" msgid="216066940197616025">"Mari kita adakan pertemuan untuk membahas masalah ini."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Sinkronisasi latar belakang untuk akun ini dinonaktifkan saat roaming."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Mengirim tanggapan..."</string>
     <string name="imap_name" msgid="8285222985908214985">"Pribadi (IMAP)"</string>
     <string name="pop3_name" msgid="6653484706414263493">"Pribadi (POP3)"</string>
@@ -238,5 +289,4 @@
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Memuat daftar folder..."</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Tak satu pun tersedia"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Setelan sinkronisasi folder"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
deleted file mode 100644
index fd014d3..0000000
--- a/res/values-is-rIS/strings.xml
+++ /dev/null
@@ -1,296 +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">"Lesa viðhengi í tölvupósti"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"Leyfir forritinu að lesa tölvupóstviðhengin þín."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"Aðgangur að gögnum tölvupóstveitu"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"Veitir forritinu aðgang að tölvupóstsgagnagrunninum þínum, þ. á m. mótteknum og sendum skeytum, notandanöfnum og aðgangsorðum."</string>
-    <string name="app_name" msgid="2206468539066258195">"Tölvupóstur"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Villuleit"</string>
-    <string name="create_action" msgid="6575946089819721958">"Búa til nýtt"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"Engin snarsvör."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"Reikningsstillingar"</string>
-    <string name="status_network_error" msgid="526826323872477973">"Vandamál við tengingu."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"Færa skeyti"</item>
-    <item quantity="other" msgid="5083310421670206821">"Færa skeyti"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3-reikningar styðja ekki að skeyti séu færð."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Ekki er hægt að færa skeyti vegna þess að margir reikningar eru valdir."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Ekki er hægt að færa skeyti sem eru í drögum, úthólfi eða sendum pósti."</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Pósthólf"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Úthólf"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Drög"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"Rusl"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"Sent"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Ruslpóstur"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Stjörnumerkt"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Ólesin"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Pósthólf"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Stjörnumerkt"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Drög"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Úthólf"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Sameinað yfirlit"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Upprunalegt skeyti --------\nEfni: <xliff:g id="SUBJECT">%1$s</xliff:g>\nFrá: <xliff:g id="SENDER">%2$s</xliff:g>\nTil: <xliff:g id="TO">%3$s</xliff:g>\nAfrit: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Setja inn snarsvar"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Setja inn snarsvar"</string>
-    <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Eitt eða fleiri viðhengi í áframsenda skeytinu verða sótt fyrir sendingu."</string>
-    <string name="attachment_not_found" msgid="5219773045406833000">"Ekki var hægt að sækja viðhengið."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"Villa kom upp við að afkóða skeytið."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Ekki var hægt að áframsenda eitt eða fleiri viðhengi."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"Viðhengi ekki áframsent"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"Innskráning á <xliff:g id="ACCOUNT_NAME">%s</xliff:g> tókst ekki."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"Innskráning tókst ekki"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"Uppsetning reiknings"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"Fer fram á auðkenningu"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"Innskráning"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"Auðkenning tókst ekki"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"Netfang eða aðgangsorð er rangt"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"Netfang:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"Tölvupóstreikningur"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"Þú getur sett upp reikninginn þinn í örfáum skrefum."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"Netfang"</string>
-    <string name="or_label" msgid="6408695162723653446">"EÐA"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Skrá inn með Google"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"AÐGANGSORÐ"</string>
-    <string name="password_hint" msgid="4226682910292828279">"Aðgangsorð"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"Skráð(ur) inn með %s"</string>
-    <string name="authentication_label" msgid="914463525214987772">"AUÐKENNING"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"Bæta auðkenningu við"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"Hreinsa auðkenningu"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"Handvirk uppsetning"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Sláðu inn gilt netfang og aðgangsorð."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Tvítekinn reikningur"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Þú ert nú þegar að nota þetta notandanafn fyrir reikninginn „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"Þetta aðgangsorð hefst eða lýkur á einu eða fleiri bilum. Margir þjónar styðja ekki aðgangsorð sem innihalda bil."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Sækir reikningsupplýsingar…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Fer yfir þjónsstillingar…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Sannprófar SMTP-stillingar…"</string>
-    <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Stofnar reikning…"</string>
-    <string name="account_setup_ab_headline" msgid="1434091698882290052">"Staðfestu tegund reiknings"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Þú gafst til kynna að <xliff:g id="EMAIL">%1$s</xliff:g> notist við <xliff:g id="USERPROTOCOL">%2$s</xliff:g> en reikningurinn kann að notast við <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
-    <string name="account_setup_names_title" msgid="8780121351085082269">"Uppsetning reiknings"</string>
-    <string name="account_setup_names_headline" msgid="2031978210683887370">"Reikningurinn hefur verið settur upp og tölvupósturinn er á leiðinni!"</string>
-    <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Gefðu þessum reikningi heiti (valfrjálst)"</string>
-    <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Nafnið þitt (birtist í sendum skeytum)"</string>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Þessi reitur má ekki vera auður."</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Uppsetning reiknings"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Tegund reiknings"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Hvernig reikningur er þetta?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Uppsetning reiknings"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Stillingar móttökuþjóns"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NOTANDANAFN"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"AÐGANGSORÐ"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"Aðgangsorð"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"NETÞJÓNN"</string>
-    <string name="account_setup_incoming_port_label" msgid="402562424498833560">"GÁTT"</string>
-    <string name="account_setup_incoming_security_label" msgid="8360505617331971663">"TEGUND ÖRYGGIS"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="2461510827337484818">"Ekkert"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="2834386066577239560">"SSL/TLS (samþykkja öll vottorð)"</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">"SSL/TLS (samþykkja öll vottorð)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="3892291833944170882">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="2341742235654301690">"Eyða tölvupósti af þjóni"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="5777530843489961009">"Aldrei"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Þegar ég eyði úr pósthólfinu"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Forskeyti IMAP-slóðar"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Valfrjálst"</string>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Uppsetning reiknings"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Stillingar sendingarþjóns"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP-ÞJÓNN"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"GÁTT"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TEGUND ÖRYGGIS"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Krefjast innskráningar"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NOTANDANAFN"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"AÐGANGSORÐ"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"BIÐLARAVOTTORÐ"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Velja"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Nota biðlaravottorð"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Fjarlægja"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Ekkert"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"AUÐKENNI FARTÆKIS"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"Reikningsstillingar"</string>
-    <string name="account_setup_options_headline" msgid="4810292194395251968">"Reikningsvalkostir"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Samstillingartíðni:"</string>
-    <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Aldrei"</string>
-    <string name="account_setup_options_mail_check_frequency_push" msgid="5511415696925307797">"Sjálfvirkt (vöktun)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="8929785860545198867">"Á 5 mínútna fresti"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="8787901333816702849">"Á 10 mínútna fresti"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"Á 15 mínútna fresti"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"Á 30 mínútna fresti"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"Á klukkustundarfresti"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"Láta mig vita þegar tölvupóstur berst"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="5029046373980454714">"Samstilla tengiliði þessa reiknings"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="303441956432308807">"Samstilla dagatal þessa reiknings"</string>
-    <string name="account_setup_options_sync_email_label" msgid="468957966555663131">"Samstilla tölvupóst þessa reiknings"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="4085327585082867216">"Sækja viðhengi sjálfkrafa þegar Wi-Fi tenging er til staðar"</string>
-    <string name="account_setup_failed_dlg_title" msgid="7923577224474005464">"Ekki tókst að ljúka uppsetningu"</string>
-    <string name="account_setup_options_mail_window_label" msgid="4737241149297585368">"Samstilla tölvupóst frá:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="7407981634952005775">"Sjálfvirkt"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"Lokadagur"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"Síðustu þrír dagar"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"Síðasta vika"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"Síðustu tvær vikur"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="3228265299330513816">"Síðasti mánuður"</string>
-    <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Allt"</string>
-    <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Nota sjálfgildi reiknings"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Rangt notandanafn eða aðgangsorð."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Innskráning tókst ekki.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Vandamál með uppsetningu reiknings"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Staðfestu að notandanafn, aðgangsorð og reikningsstillingar séu réttar."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Ekki náðist örugg tenging við þjóninn."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"Ekki náðist örugg tenging við þjóninn.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="4607859382193244795">"Krafist er vottorðs frá biðlara. Viltu tengjast þjóninum með vottorði biðlara?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="4574461885959029072">"Vottorðið er ógilt eða óaðgengilegt."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="430054384233036305">"Þjónninn svaraði með villu. Athugaðu notandanafn og aðgangsorð og reyndu aftur."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="1180197172141077524">"Ekki tókst að tengjast við þjóninn."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="3889441611138037320">"Ekki náðist tenging við þjóninn.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_tls_required" msgid="1902309158359287958">"TLS er krafist en þjónninn styður það ekki."</string>
-    <string name="account_setup_failed_auth_required" msgid="2684010997018901707">"Þjónninn styður ekki auðkenningaraðferðir."</string>
-    <string name="account_setup_failed_security" msgid="1627240499907011040">"Ekki tókst að opna tengingu við þjóninn vegna öryggisvillu."</string>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"Ekki tókst að koma á tengingu við þjóninn."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"Þú slóst inn rangt vistfang þjóns eða þjónninn krefst útgáfu af samskiptareglu sem tölvupóstforritið styður ekki."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"Þú hefur ekki heimild til að samstilla við þennan þjón. Hafðu samband við kerfisstjóra þjónsins til að fá frekari upplýsingar."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"Fjarstýrt öryggi"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Þjónninn <xliff:g id="SERVER">%s</xliff:g> krefst þess að þú leyfir honum að fjarstýra einhverjum öryggiseiginleikum Android tækisins þíns. Viltu ljúka við að setja upp þennan reikning?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Þessi þjónn krefst öryggiseiginleika sem Android tækið þitt styður ekki, þar á meðal: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Þú getur ekki breytt notandanafni reiknings. Ýttu á Bæta reikningi við til að bæta við reikningi með öðru notandanafni."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"VIÐVÖRUN: Ef heimild tölvupóstsforritsins til að stýra tækinu er afturkölluð verður öllum tölvupóstreikningum sem krefjast hennar eytt ásamt tölvupósti, tengiliðum, dagatalsviðburðum og öðrum gögnum."</string>
-    <string name="account_security_dialog_title" msgid="7003032393805438164">"Öryggisuppfærsla"</string>
-    <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> krefst þess að þú uppfærir öryggisstillingarnar þínar."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="3249185558872836884">"Öryggiskröfur valda því að ekki er hægt að samstilla reikninginn „<xliff:g id="ACCOUNT">%s</xliff:g>“."</string>
-    <string name="security_needed_ticker_fmt" msgid="7099561996532829229">"Reikningurinn „<xliff:g id="ACCOUNT">%s</xliff:g>“ krefst uppfærslu á öryggisstillingum."</string>
-    <string name="security_changed_ticker_fmt" msgid="3823930420292838192">"Öryggisstillingum reikningsins „<xliff:g id="ACCOUNT">%s</xliff:g>“ var breytt. Þú þarft ekkert að aðhafast."</string>
-    <string name="security_notification_content_update_title" msgid="6321099538307807621">"Öryggisuppfærslu er krafist"</string>
-    <string name="security_notification_content_change_title" msgid="615639963487448183">"Öryggisstefnur hafa breyst"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"Ekki hægt að uppfylla stefnur"</string>
-    <string name="account_security_title" msgid="6072273231606918870">"Öryggi tækis"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="2527501853520160827">"Þjónninn <xliff:g id="SERVER">%s</xliff:g> krefst þess að þú veitir honum heimild til að fjarstýra einhverjum öryggiseiginleikum Android tækisins."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="8155332642922842729">"Breyta upplýsingum"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="5543005790538884060">"„<xliff:g id="ACCOUNT">%s</xliff:g>“ krefst þess að þú breytir PIN-númeri eða aðgangsorði lásskjásins."</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"Aðgangsorð lásskjás rennur út"</string>
-    <string name="password_expired_ticker" msgid="3098703963402347483">"PIN-númer eða aðgangsorð lásskjásins er útrunnið."</string>
-    <string name="password_expired_content_title" msgid="7379094218699681984">"Aðgangsorð lásskjás útrunnið"</string>
-    <string name="password_expire_warning_dialog_title" msgid="4901499545146045672">"Aðgangsorð lásskjásins er að renna út"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="1093389293050776319">"Þú verður að breyta PIN-númeri eða aðgangsorði lásskjásins bráðlega; að öðrum kosti verður gögnum <xliff:g id="ACCOUNT">%s</xliff:g> eytt. Viltu breyta núna?"</string>
-    <string name="password_expired_dialog_title" msgid="7275534155170185252">"Aðgangsorð lásskjásins er útrunnið"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Verið er að eyða gögnum <xliff:g id="ACCOUNT">%s</xliff:g> úr tækinu. Þú getur endurheimt þau með því að breyta PIN-númeri eða aðgangsorði lásskjásins. Viltu breyta núna?"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Fleygja óvistuðum breytingum?"</string>
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Innskráning tókst ekki"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Notandanafn eða aðgangsorð fyrir <xliff:g id="ACCOUNT">%s</xliff:g> er rangt. Viltu uppfæra þessar upplýsingar núna?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Innskráningin á <xliff:g id="ACCOUNT">%s</xliff:g> mistókst. Þjónninn sagði: <xliff:g id="REASON">%s</xliff:g> Viltu uppfæra notandanafnið þitt og/eða aðgangsorð?"</string>
-    <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Sækja viðhengi"</string>
-    <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Sækja viðhengi nýlegra skeyta sjálfkrafa í gegnum Wi-Fi"</string>
-    <string name="account_settings_notify_label" msgid="8621226576645167987">"Tilkynningar um tölvupóst"</string>
-    <string name="account_settings_summary" msgid="4733776978291376161">"Samstillingartíðni, tilkynningar o.s.frv."</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"Senda tilkynningu þegar tölvupóstur berst"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"Samstillingartíðni"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"Móttökustillingar"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"Notandanafn, aðgangsorð og aðrar stillingar móttökuþjóns"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"Sendingarstillingar"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"Notandanafn, aðgangsorð og aðrar stillingar sendingarþjóns"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"Stefnum framfylgt"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"Ekkert"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"Óstuddar stefnur"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"Ekkert"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"Reyna samstillingu"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"Snertu hér til að samstilla þennan reikning"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"Heiti reiknings"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"Nafnið þitt"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"Snarsvör"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"Breyta texta sem þú setur oft inn þegar þú skrifar tölvupóst"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"Tilkynningastillingar"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"Gagnanotkun"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"Öryggisstefnur"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"Kerfismöppur"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"Ruslmappa"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"Veldu möppu fyrir rusl á þjóninum"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"Veldu möppu fyrir rusl á þjóninum"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"Mappa fyrir send atriði"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"Veldu möppu fyrir send atriði á þjóninum"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"Veldu möppu fyrir send atriði á þjóninum"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"Snarsvar"</string>
-    <string name="save_action" msgid="5740359453077441466">"Vista"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"Samstilla tengiliði"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"Samstilla tengiliði þessa reiknings"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"Samstilla dagatal"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Samstilla dagatalsviðburði þessa reiknings"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Samstilla tölvupóst"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Samstilla tölvupóst þessa reiknings"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Titringur"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"Velja hringitón"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"Stillingar þjóns"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Samstillingarkostir"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"Samstillingarkostir (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Samstilla þessa möppu"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Skeyti verða sótt þegar tenging er til staðar"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Dagar af pósti til að samstilla"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Mynd sendanda"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"Aðeins sumir „Plus“-reikningar bjóða upp á POP-aðgang til að gera þessu forriti kleift að tengjast. Ef þú getur ekki skráð þig inn með réttu netfangi og aðgangsorði er ekki víst að þú sért með „Plus“-reikning sem greitt hefur verið fyrir. Opnaðu vafra til að fá aðgang að þessum tölvupóstreikningum."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"Áður en þessi tölvupóstreikningur er settur upp skaltu fara á vefsvæði T-Online og stofna aðgangsorð fyrir POP3-aðgang að tölvupósti."</string>
-    <string name="exchange_name" msgid="3793803477985438102">"Fyrirtæki"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"Ekki var hægt að stofna reikninginn. Reyndu aftur."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"Tölvupóstur"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"Gerir öryggisstefnur frá þjóni virkar"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"Stillingar"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"Almennar stillingar"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Staðfesta áður en eytt er"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Staðfesta áður en þú sendir"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"Leita í tölvupósti"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Banna notkun myndavélar tækisins"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"Krefjast aðgangsorðs fyrir tæki"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"Takmarka endurnýtingu nýlegra aðgangsorða"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"Krefjast þess að aðgangsorð renni út"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"Krefjast að skjá sé læst ef tækið er ekki í notkun"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"Takmarka fjölda samstilltra dagatalsviðburða"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"Takmarka fjölda samstilltra skeyta"</string>
-    <string name="quick_1" msgid="9130521670178673190">"Takk!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"Hljómar vel fyrir mitt leyti!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"Ég les þetta seinna og verð í sambandi."</string>
-    <string name="quick_4" msgid="216066940197616025">"Höldum fund til að ræða þetta."</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"Í reiki er slökkt á samstillingu í bakgrunni fyrir þennan reikning."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"Sendir svar…"</string>
-    <string name="no_conversations" msgid="3785854971159919343">"Engin skeyti."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"Möppuval"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"Veldu möppu fyrir rusl fyrir <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"Veldu möppu fyrir send atriði fyrir <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Hleður möppulista…"</string>
-    <string name="no_quick_responses" msgid="8716297053803961304">"Ekkert í boði"</string>
-    <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Valkostir möppusamstillingar"</string>
-</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2b667c9..d7da3ac 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Accesso ai dati del provider di posta"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Consente all\'applicazione di accedere al database della tua posta, inclusi i messaggi ricevuti e inviati, i nomi utente e le password."</string>
     <string name="app_name" msgid="2206468539066258195">"Email"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Debug"</string>
     <string name="create_action" msgid="6575946089819721958">"Crea nuova"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Nessuna risposta rapida."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Impostazioni account"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Problema di connessione."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Sposta messaggio"</item>
+    <item quantity="other" msgid="5083310421670206821">"Sposta messaggi"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Lo spostamento non è supportato negli account POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Impossibile spostare i messaggi perché la selezione contiene più account."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"I messaggi in Bozze, Posta in uscita e Posta inviata non possono essere spostati."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Posta in arrivo"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Posta in uscita"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Bozze"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Posta indesiderata"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Speciali"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Da leggere"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Debug"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Posta in arrivo"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Speciali"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Bozze"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Posta in uscita"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Visualizzazione combinata"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Messaggio originale --------\nOggetto: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDa: <xliff:g id="SENDER">%2$s</xliff:g>\nA: <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">"Inserisci risposta rapida"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Inserisci risposta rapida"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Prima dell\'invio verranno scaricati uno o più allegati del messaggio inoltrato."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Impossibile scaricare l\'allegato."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Si è verificato un errore durante la decodifica del messaggio."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Impossibile inoltrare uno o più allegati."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Allegato non inoltrato"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Accesso a <xliff:g id="ACCOUNT_NAME">%s</xliff:g> non riuscito."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Accesso non riuscito"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Impostazione account"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Richiesta di autorizzazione"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Accedi"</string>
@@ -64,17 +93,22 @@
     <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>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Questa password inizia o termina con uno o più spazi. Molti server non supportano le password contenenti spazi."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Recupero informazioni sull\'account…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Convalida impostazioni del server…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Convalida delle impostazioni SMTP…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Creazione account…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Conferma tipo di account"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Hai indicato che <xliff:g id="EMAIL">%1$s</xliff:g> utilizza <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, ma l\'account potrebbe utilizzare <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Impostazione account"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Il tuo account è stato impostato e l\'email sarà presto disponibile."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Assegna un nome all\'account (facoltativo)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Il tuo nome (nei messaggi in uscita)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Questo campo non può essere vuoto."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Impostazione account"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Tipo di account"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Di quale tipo di account si tratta?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Impostazione account"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Impostazioni server Posta in arrivo"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NOME UTENTE"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"PASSWORD"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Quando elimino da Posta in arrivo"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Prefisso percorso IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Facoltativo"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Impostazione account"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Impostazioni server Posta in uscita"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVER SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORTA"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TIPO DI SICUREZZA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Richiedi accesso"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NOME UTENTE"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"PASSWORD"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFICATO CLIENT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Seleziona"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Usa certificato client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Rimuovi"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Nessuno"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID DISPOSITIVO MOBILE"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Impostazioni account"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Opzioni account"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Frequenza sincronizzazione:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Mai"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Tutto"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Usa imp. predef. account"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Password o nome utente errato."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Accesso non riuscito.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problema di configurazione dell\'account"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Conferma se nome utente, password e impostazioni account sono corretti."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Impossibile connettersi in modo sicuro al server."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Amministrazione sicurezza da remoto"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Il server <xliff:g id="SERVER">%s</xliff:g> richiede che tu consenta il controllo remoto di alcune funzionalità di sicurezza del tuo dispositivo Android. Completare la configurazione dell\'account?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Il server richiede funzioni di sicurezza non supportate dal tuo dispositivo Android, fra cui: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Non è possibile modificare il nome utente di un account. Per aggiungere un account con un altro nome utente, tocca Aggiungi account."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"AVVISO. La disattivazione dell\'autorità dell\'applicazione Email per l\'amministrazione del dispositivo comporterà l\'eliminazione di tutti gli account email che la richiedono, compresi i relativi messaggi email, contatti, eventi di calendario e altri dati."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Aggiornamento sicurezza"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> richiede l\'aggiornamento delle impostazioni di sicurezza."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Password blocco schermo scaduta"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"I dati relativi a <xliff:g id="ACCOUNT">%s</xliff:g> stanno per essere cancellati dal dispositivo. È possibile ripristinarli modificando il PIN o la password di blocco dello schermo. Vuoi apportare la modifica ora?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Ignorare le modifiche non salvate?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Impossibile accedere"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Password o nome utente di <xliff:g id="ACCOUNT">%s</xliff:g> errato. Vuoi aggiornarli ora?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Accesso a <xliff:g id="ACCOUNT">%s</xliff:g> non riuscito. Il server ha restituito il seguente messaggio: <xliff:g id="REASON">%s</xliff:g> Vuoi aggiornare nome utente e/o password?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Scarica allegati"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Scarica automaticamente allegati messaggi recenti tramite Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Notifiche email"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sincron. evento calendario account"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronizza email"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronizza le email per questo account"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrazione"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrazione"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Scegli suoneria"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Impostazioni server"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opzioni di sincronizzazione"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sincronizza questa cartella"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"I messaggi verranno scaricati dopo la connessione"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Numero di giorni da sincronizzare"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Immagine mittente"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Solo alcuni account \"Plus\" includono l\'accesso POP che consente la connessione del programma. Se non riesci ad accedere con l\'indirizzo email e la password corretti, potresti non disporre di un account \"Plus\" a pagamento. Avvia il browser web per avere accesso a questi account email."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Prima di configurare questo account email, visita il sito web T-Online e crea una password per l\'accesso email POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Aziendale"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Impossibile creare l\'account. Riprova."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Posta"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Abilita norme di sicurezza specificate dal server"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Impostazioni"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Impostazioni generali"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Conferma prima di eliminare"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Conferma prima di inviare"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Cerca email"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Non consentire uso fotocamera dispositivo"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Richiedi password dispositivo"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Limita riutilizzo password recenti"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Per me va bene."</string>
     <string name="quick_3" msgid="8070999183033184986">"Lo leggerò più tardi e ti farò sapere."</string>
     <string name="quick_4" msgid="216066940197616025">"Organizziamo una riunione per discuterne."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Sincronizzazione dello sfondo per questo account disattivata durante il roaming."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Invio risposta..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personale (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personale (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Nessun messaggio."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Selettore cartelle"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Selez. cartella Cestino server per <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Selez. cartella posta inviata server (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Caricamento elenco cartelle…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Nessuna disponibile"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Impostazioni di sincronizzazione cartella"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index fbe3255..c085f18 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -24,6 +24,14 @@
     <string name="create_action" msgid="6575946089819721958">"צור חדש"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"אין תגובות מהירות."</string>
     <string name="account_settings_action" msgid="589969653965674604">"הגדרות חשבון"</string>
+    <string name="status_network_error" msgid="526826323872477973">"בעיה בחיבור."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"העבר הודעה"</item>
+    <item quantity="other" msgid="5083310421670206821">"העבר הודעות"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"‏העברה אינה נתמכת בחשבונות POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"לא ניתן לבצע העברה מכיוון שהבחירה כוללת מספר חשבונות."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"לא ניתן להעביר הודעות שנמצאות בתיקיות \'טיוטות\', \'תיבת דואר יוצא\' ו\'פריטים שנשלחו\'."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"תיבת דואר נכנס"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"תיבת דואר יוצא"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"טיוטות"</string>
@@ -32,26 +40,46 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"ספאם"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"מסומנת בכוכב"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"לא נקרא"</string>
-    <string name="debug_title" msgid="1337476992195531309">"ניקוי באגים"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"תיבת דואר נכנס"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"מסומנת בכוכב"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"טיוטות"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"תיבת דואר יוצא"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"לא ניתן להוריד את הקובץ המצורף."</string>
     <string name="message_decode_error" msgid="91396461771444300">"אירעה שגיאה בעת פענוח ההודעה."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"לא ניתן להעביר קובץ מצורף אחד או יותר."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"הקובץ המצורף לא הועבר"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"הכניסה ל-<xliff:g id="ACCOUNT_NAME">%s</xliff:g> נכשלה."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"לא ניתן היה להיכנס"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"‎<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"‎<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"‎<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"‎<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"‎<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"‎<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"‎<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"‎<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"הגדרת חשבון"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"מבקש הרשאה"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"היכנס"</string>
     <string name="oauth_error_description" msgid="8466102021844409849">"לא ניתן לאמת"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"כתובת האימייל או הסיסמה שגויות"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"כתובת אימייל:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"חשבון אימייל"</string>
+    <string name="password_warning_label" msgid="1887439537224212124">"כתובת הדוא\"ל או הסיסמה שגויות"</string>
+    <string name="email_confirmation_label" msgid="64258748053106017">"כתובת דוא\"ל:"</string>
+    <string name="account_setup_basics_headline" msgid="8468280216822264643">"חשבון דוא\"ל"</string>
     <string name="accounts_welcome" msgid="7230367425520242593">"ניתן להגדיר את החשבון במספר פעולות פשוטות."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"כתובת אימייל"</string>
+    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"כתובת דוא\"ל"</string>
     <string name="or_label" msgid="6408695162723653446">"או"</string>
     <string name="sign_in_with_google" msgid="1412668282326928102">"‏היכנס באמצעות Google"</string>
     <string name="account_setup_basics_password_label" msgid="784962388753706730">"סיסמה"</string>
@@ -61,9 +89,10 @@
     <string name="add_authentication_label" msgid="382998197798081729">"הוסף אימות"</string>
     <string name="clear_authentication_label" msgid="4750930803913225689">"הסר אימות"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"הגדרה ידנית"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"הקלד כתובת אימייל וסיסמה חוקיות."</string>
+    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"הקלד כתובת דוא\"ל וסיסמה חוקיות."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"חשבון משוכפל"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"אתה כבר משתמש בשם משתמש זה עבור החשבון \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"סיסמה זו מתחילה או מסתיימת בתו רווח אחד או יותר. שרתים רבים אינם תומכים בסיסמאות המכילות רווחים."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"מאחזר פרטי חשבון..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"מאמת הגדרות שרת…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"‏מאמת הגדרות smtp…"</string>
@@ -73,8 +102,11 @@
     <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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"שדה זה לא יכול להיות ריק."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"הגדרת חשבון"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"סוג חשבון"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"איזה סוג חשבון זה?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"הגדרת חשבון"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"הגדרות שרת דואר נכנס"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"שם משתמש"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"סיסמה"</string>
@@ -87,23 +119,26 @@
     <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>
-    <string name="account_setup_incoming_delete_policy_label" msgid="2341742235654301690">"מחק אימיילים מהשרת"</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_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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"הגדרת חשבון"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"הגדרות של שרת דואר יוצא"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"‏שרת SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"יציאה"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"סוג אבטחה"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"דרושה כניסה"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"שם משתמש"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"סיסמה"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"אישור לקוח"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"בחר"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"השתמש באישור לקוח"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"הסר"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"אף אחד"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"מזהה מכשיר נייד"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"הגדרות חשבון"</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>
@@ -113,13 +148,13 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"כל 15 דקות"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"כל 30 דקות"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"כל שעה"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"הודע לי כשמגיע אימייל"</string>
+    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"הודע לי כשמגיע דוא\"ל"</string>
     <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_sync_email_label" msgid="468957966555663131">"סנכרן דוא\"ל מחשבון זה"</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_label" msgid="4737241149297585368">"סנכרן הודעות דוא\"ל מ:"</string>
     <string name="account_setup_options_mail_window_auto" msgid="7407981634952005775">"אוטומטי"</string>
     <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"היום האחרון"</string>
     <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"שלושת השבועות האחרונים"</string>
@@ -129,6 +164,7 @@
     <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_fmt" msgid="8811464534757505457">"ההתחברות נכשלה.\n(‏<xliff:g id="ERROR">%s</xliff:g>)‏"</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>
@@ -142,7 +178,7 @@
     <string name="account_setup_failed_auth_required" msgid="2684010997018901707">"השרת אינו תומך בשיטות האימות."</string>
     <string name="account_setup_failed_security" msgid="1627240499907011040">"לא ניתן לפתוח חיבור לשרת בשל שגיאת אבטחה."</string>
     <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"לא ניתן לפתוח חיבור לשרת."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"הקלדת כתובת שרת שגויה, או שהשרת דורש גירסת פרוטוקול שאינה נתמכת על ידי האימייל."</string>
+    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"הקלדת כתובת שרת שגויה, או שהשרת דורש גירסת פרוטוקול שאינה נתמכת על ידי הדוא\"ל."</string>
     <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"אין לך אישור לסנכרן באמצעות שרת זה. צור קשר עם מנהל המערכת של השרת לקבלת מידע נוסף."</string>
     <string name="account_setup_security_required_title" msgid="667943309546419435">"ניהול אבטחה מרחוק"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"‏השרת <xliff:g id="SERVER">%s</xliff:g> דורש שתאפשר לו שליטה מרחוק על תכונות אבטחה מסוימות במכשיר Android שלך. האם ברצונך לסיים את ההגדרה של חשבון זה?"</string>
@@ -168,11 +204,14 @@
     <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> נמחקים מהמכשיר שלך. תוכל לשחזר אותם על ידי שינוי ה-PIN או הסיסמה של נעילת המסך. האם ברצונך לשנות כעת?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"למחוק שינויים שלא נשמרו?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"לא ניתן היה להיכנס"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"שם המשתמש או הסיסמה עבור <xliff:g id="ACCOUNT">%s</xliff:g> שגוי. האם ברצונך לעדכן כעת?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"הכניסה שלך אל <xliff:g id="ACCOUNT">%s</xliff:g> נכשלה. השרת החזיר את הסיבה: <xliff:g id="REASON">%s</xliff:g> האם אתה רוצה לעדכן את שם המשתמש ו/או הסיסמה שלך?"</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>
-    <string name="account_settings_summary" msgid="4733776978291376161">"תדירות סנכרון, התראות וכדומה"</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"שלח הודעה כשמגיע אימייל"</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>
     <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"תדירות סנכרון"</string>
     <string name="account_settings_incoming_label" msgid="3793314460723296874">"הגדרות דואר נכנס"</string>
     <string name="account_settings_incoming_summary" msgid="7521181981008371492">"שם משתמש, סיסמה והגדרות אחרות של שרת דואר נכנס"</string>
@@ -187,7 +226,7 @@
     <string name="account_settings_description_label" msgid="2073736045984411004">"שם חשבון"</string>
     <string name="account_settings_name_label" msgid="8230436030850457988">"השם שלך"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"תגובות מהירות"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"ערוך טקסט שאתה מוסיף לעתים קרובות בזמן כתיבת אימייל"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"ערוך טקסט שאתה מוסיף לעתים קרובות בזמן כתיבת דוא\"ל"</string>
     <string name="account_settings_notifications" msgid="2842952349214972116">"הגדרות התראות"</string>
     <string name="account_settings_data_usage" msgid="6400715160238559711">"שימוש בנתונים"</string>
     <string name="account_settings_policies" msgid="5972183883466873359">"מדיניות אבטחה"</string>
@@ -209,7 +248,7 @@
     <string name="label_notification_vibrate_title" msgid="140881511322826320">"רטט"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"בחר רינגטון"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"הגדרות שרת"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"אפשרויות סנכרון"</string>
+    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"אפשרויות סינכרון"</string>
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"אפשרויות סנכרון (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"סנכרן את התיקיה הזו"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"לאחר שתחחבר תתבצע הורדה של ההודעות"</string>
@@ -217,7 +256,7 @@
     <string name="provider_note_t_online" msgid="1596701148051980218">"‏לפני הגדרת חשבון אימייל זה, בקר באתר T-Online וצור סיסמה לגישה לאימייל מסוג POP3."</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"לא ניתן ליצור את החשבון. נסה שוב."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"אימייל"</string>
+    <string name="device_admin_label" msgid="3335272972461391415">"דוא\"ל"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"מאפשר מדיניות אבטחה המצוינת בשרת"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"אל תאפשר שימוש במצלמה של המכשיר"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"נדרשת סיסמת מכשיר"</string>
@@ -225,18 +264,19 @@
     <string name="policy_password_expiration" msgid="1287225242918742275">"נדרשת תפוגת סיסמאות"</string>
     <string name="policy_screen_timeout" msgid="3499201409239287702">"כפה נעילת מסך של מכשיר לא פעיל"</string>
     <string name="policy_calendar_age" msgid="6469328498345236120">"הגבל את מספר אירועי לוח השנה המסונכרנים"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"הגבל את מספר פריטי האימייל המסונכרנים"</string>
+    <string name="policy_email_age" msgid="3521941976575225050">"הגבל את מספר פריטי הדוא\"ל המסונכרנים"</string>
     <string name="quick_1" msgid="9130521670178673190">"תודה!"</string>
     <string name="quick_2" msgid="8611591278119481491">"נשמע לי טוב!"</string>
     <string name="quick_3" msgid="8070999183033184986">"אקרא את זה מאוחר יותר ואחזור אליך."</string>
     <string name="quick_4" msgid="216066940197616025">"בוא נקבע פגישה כדי לדון בנושא זה."</string>
     <string name="confirm_response" msgid="6764021931370809514">"שולח תגובה…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"‏אישי (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"‏אישי (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"אין הודעות."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"בוחר תיקיות"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"בחר את תיקיית האשפה של השרת עבור <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"בחר את תיקיית הפריטים שנשלחו של השרת עבור <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <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>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3abcf35..572c07a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"メールプロバイダのデータへのアクセス"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"このアプリにメールデータベース(送受信したメッセージ、ユーザー名、パスワードを含む)へのアクセスを許可します。"</string>
     <string name="app_name" msgid="2206468539066258195">"メール"</string>
+    <string name="debug_title" msgid="1337476992195531309">"デバッグ"</string>
     <string name="create_action" msgid="6575946089819721958">"新規作成"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"クイック返信がありません。"</string>
     <string name="account_settings_action" msgid="589969653965674604">"アカウントの設定"</string>
+    <string name="status_network_error" msgid="526826323872477973">"接続エラーです。"</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"メッセージを移動"</item>
+    <item quantity="other" msgid="5083310421670206821">"メッセージを移動"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3アカウントでは移動はサポートされていません。"</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"移動できません。複数のアカウントを選択しています。"</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"[下書き]、[送信トレイ]、[送信済み]のメッセージは移動できません。"</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"受信トレイ"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"送信トレイ"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"下書き"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"迷惑メール"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"スター付き"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"未読"</string>
-    <string name="debug_title" msgid="1337476992195531309">"デバッグ"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"受信トレイ"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"スター付き"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"下書き"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"送信トレイ"</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>\nFrom: <xliff:g id="SENDER">%2$s</xliff:g>\nTo: <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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"添付ファイルをダウンロードできませんでした。"</string>
     <string name="message_decode_error" msgid="91396461771444300">"メッセージのデコード中にエラーが発生しました。"</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"添付ファイルを転送できませんでした。"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"添付ファイルを転送できません"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>でログインできませんでした。"</string>
     <string name="login_failed_title" msgid="1737884069957090004">"ログインできませんでした"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"アカウント設定"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"認証をリクエスト中"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"ログイン"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"有効なメールアドレスとパスワードを入力してください。"</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"重複するアカウント"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"このユーザー名はアカウント「<xliff:g id="DUPLICATE">%s</xliff:g>」で既に使用しています。"</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"このパスワードは先頭または末尾にスペースがあります。多くのサーバーはスペースを含むパスワードに対応していません。"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"アカウント情報を取得中..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"サーバー設定を確認しています…"</string>
     <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_names_title" msgid="8780121351085082269">"アカウント設定"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"このフィールドは必須です。"</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"アカウント設定"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"アカウントの種類"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"このアカウントの種類を選択します"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"アカウント設定"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"受信サーバーの設定"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ユーザー名"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"パスワード"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"アカウント設定"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"送信サーバーの設定"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTPサーバー"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ポート"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"セキュリティの種類"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"ログインが必要"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ユーザー名"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"パスワード"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"クライアント証明書"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"選択"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"クライアント証明書を使用"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"削除"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"なし"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"携帯端末ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"アカウントの設定"</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>
@@ -127,8 +164,9 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"過去2週間"</string>
     <string name="account_setup_options_mail_window_1month" msgid="3228265299330513816">"過去1か月"</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_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_fmt" msgid="8811464534757505457">"ログインに失敗しました。\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"セキュリティのリモート管理"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Android搭載携帯のセキュリティ機能の一部に対するリモートコントロールをサーバー<xliff:g id="SERVER">%s</xliff:g>に許可する必要があります。アカウントの設定を終了しますか?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"このサーバーには、お使いのAndroid搭載端末でサポートされていない次のセキュリティ機能が必要です: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"アカウントのユーザー名を変更することはできません。別のユーザー名を使用するアカウントを追加するには、[アカウントを追加]をタップします。"</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"警告: メールアプリの端末管理権限を無効にすると、権限を必要とするすべてのメールアカウントが削除されます。また、そのアカウントのメール、連絡先、カレンダーの予定などのデータも削除されます。"</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>
@@ -168,6 +207,9 @@
     <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>のデータが端末から消去されます。ロック解除PINまたはパスワードを変更するとデータを元に戻すことができます。今すぐ変更しますか?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"保存されていない変更を破棄しますか?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"ログインできませんでした"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g>のユーザー名またはパスワードが正しくありません。今すぐ更新しますか?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"<xliff:g id="ACCOUNT">%s</xliff:g>にログインできませんでした。サーバーからのエラーメッセージは「<xliff:g id="REASON">%s</xliff:g>」です。ユーザー名またはパスワードを更新しますか?"</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>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"このアカウントのカレンダーの予定を同期"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"メールを同期する"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"このアカウントのメールを同期"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"バイブレーション"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"バイブレーション"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"着信音を選択"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"サーバー設定"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"同期オプション"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"このフォルダを同期"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"接続時にメッセージをダウンロード"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"同期するメールの日数"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"送信者の画像"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"このプログラムでPOPアクセスが許可されているのは一部の「Plus」アカウントだけです。有料の「Plus」アカウントがなければ、正しいメールアドレスとパスワードを入力してもログインできません。これらのメールアカウントにはブラウザからアクセスしてください。"</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"このメールアカウントをセットアップする前に、T-Onlineウェブサイトにアクセスして、POP3メールアクセス用のパスワードを作成してください。"</string>
+    <string name="exchange_name" msgid="3793803477985438102">"コーポレート"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"アカウントを作成できませんでした。もう一度お試しください。"</string>
     <string name="device_admin_label" msgid="3335272972461391415">"メール"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"サーバーが指定したセキュリティポリシーを有効にします"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"設定"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"全般設定"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"削除前に確認する"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"送信前に確認する"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"メールを検索"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"端末のカメラの使用を許可しない"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"端末のパスワードを必須とする"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"最近使用したパスワードの再使用を制限する"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"良いと思います。"</string>
     <string name="quick_3" msgid="8070999183033184986">"確認して折り返し連絡します。"</string>
     <string name="quick_4" msgid="216066940197616025">"この件についてミーティングを行いませんか。"</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"このアカウントのバックグラウンドでの同期は、ローミング中は無効です。"</string>
     <string name="confirm_response" msgid="6764021931370809514">"出欠状況を送信しています…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"個人用(IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"個人用(POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"メッセージはありません。"</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"フォルダの選択"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g>のサーバーのゴミ箱フォルダを選択してください"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g>のサーバーの送信済みフォルダを選択してください"</string>
     <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>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 7559c5f..11801b9 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"წვდომა ელფოსტის პროვაიდერის მონაცემებზე"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"აპს უფლება ექნება მიწვდეს თქვენი ელფოსტის მონაცემთა ბაზას. მათ შორის მიღებულ და გაგზავნილ შეტყობინებებს, ასევე მომხმარებლის სახელებსა და პაროლებს."</string>
     <string name="app_name" msgid="2206468539066258195">"ელფოსტა"</string>
+    <string name="debug_title" msgid="1337476992195531309">"გამართვა"</string>
     <string name="create_action" msgid="6575946089819721958">"ახლის შექმნა"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"სწრაფი პასუხები არ არის.."</string>
     <string name="account_settings_action" msgid="589969653965674604">"ანგარიშის პარამეტრები"</string>
+    <string name="status_network_error" msgid="526826323872477973">"კავშირის პრობლემა."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"შეტყობინების გადატანა"</item>
+    <item quantity="other" msgid="5083310421670206821">"შეტყობინებების გადატანა"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"გადაადგილება მხარდაუჭერელია POP3 ანგარიშებისთვის."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"გადაადგილება შეუძლებელია, რადგან მონიშვნა შეიცავს რამდენიმე ანგარიშს."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"მონახაზებში, გასაგზავნში და გაგზავნილებში მოთავსებული შეტყობინებების გადაადგილება შეუძლებელია."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"შემოსულები"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"გასაგზავნი"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"მონახაზები"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"არასასურველი"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"ვარსკვლავიანი"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"წაუკითხავი"</string>
-    <string name="debug_title" msgid="1337476992195531309">"გამართვა"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"შემოსულები"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"ვარსკვლავიანი"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"მონახაზები"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"გასაგზავნი"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"დანართის ჩამოტვირთვა ვერ მოხერხდა."</string>
     <string name="message_decode_error" msgid="91396461771444300">"შეტყობინების გაშიფრვისას წარმოიშვა შეცდომა."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"ერთი ან რამდენიმე დანართის გადაგზავნა ვერ მოხერხდა."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"დანართი ვერ გადაიგზავნა"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> შესვლა წარუმატებლად დასრულდა."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"შესვლა ვერ მოხერხდა"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>ბაიტი"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>ბაიტი"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>კბაიტი"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>კბაიტი"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>მბაიტი"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>მბაიტი"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>გბაიტი"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>გბაიტი"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"ანგარიშის დაყენება"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"ავტორიზაციის მოთხოვნა"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"შესვლა"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"აკრიფეთ ნამდვილი ელფოსტის მისამართი და პაროლი."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"დუბლირებული ანგარიში"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"თქვენ უკვე იყენებთ მომხმარებლის სახელს ანგარიშისთვის \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"ეს პაროლი იწყება ან მთავრდება შორისის სიმბოლოთი. ბევრ სერვერს არ აქვს მსგავსი პაროლის გამოყენების მხარდაჭერა."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"ანგარიშის შესახებ ინფორმაციის ამოღება…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"სერვერის პარამეტრების გადამოწმება…"</string>
     <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_names_title" msgid="8780121351085082269">"ანგარიშის დაყენება"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"ეს ველი არ შეიძლება ცარიელი იყოს."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"ანგარიშის დაყენება"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"ანგარიშის ტიპი"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"ეს რა ტიპის ანგარიშია?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"ანგარიშის დაყენება"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"შემომავალი სერვერის პარამეტრები"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"მომხმარებლის სახელი"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"პაროლი"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"ანგარიშის დაყენება"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"გამავალი სერვერის პარამეტრები"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP სერვერი"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"პორტი"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"უსაფრთხოების ტიპი"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"მოითხოვე სისტემაში შესვლა"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"მომხმარებლის სახელი"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"პაროლი"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"კლიენტის სერტიფიკატი"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"არჩევა"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"კლიენტის სერტიფიკატის გამოყენება"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"ამოშლა"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"არცერთი"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"მობილური მოწყობილობის ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"ანგარიშის პარამეტრები"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"შესვლა ვერ მოხერხდა.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"უსაფრთხოების დისტანციური ადმინისტრირება"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"თქვენ არ შეგიძლიათ ანგარიშის მომხმარებლის სახელის შეცვლა. სხვა სახელის ანგარიშის დასამატებლად შეეხეთ „ანგარიშის დამატებას“."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"გაფრთხილება: თქვენს მოწყობილობაზე ადმინისტრირების უფლების გამორთვა ელფოსტის აპისთვის გამოიწვევს ყველა იმ ელფოსტის ანგარიშის წაშლას, რომელიც იყენებს ამ ფუნქციას. მათ შორის წაიშლება ყველა კონტაქტი, შეტყობინება, კალენდრის ღონისძიებები და სხვა მონაცემები."</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>
@@ -168,6 +207,9 @@
     <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> ანგარიშის მონაცემები წაიშლება თქვენი მოწყობილობიდან. თქვენ შეგიძიათ აღდგინოთ ისინი თქვენი ეკრანის დამბლოკველის PIN კოდის ან პაროლის შეცვლით. შევცვალო ახლავე?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"გაუქმდეს შესანახი ცვლილებები?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"შესვლა ვერ მოხერხდა"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"მომხმარებლის სახელი ან პაროლი ანგარიშისთვის <xliff:g id="ACCOUNT">%s</xliff:g> არასწორია. ახლავე გსურთ მათი განახლება?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"<xliff:g id="ACCOUNT">%s</xliff:g>-ში შესვლა ვერ მოხერხდა; სერვერის პასუხია: <xliff:g id="REASON">%s</xliff:g> გსურთ თქვენი მომხმარებლის სახელისა და პაროლის განახლება?"</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>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ამ ანგარიშისთვის კალენდრის ღონისძიების სინქრონიზაცია"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ელფოსტის სინქრონიზაცია"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ანგარიშის ელფოსტის სინქრონიზაცია"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"ვიბრაცია"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"ვიბრაცია"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"ზარის მელოდიის არჩევა"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"სერვერის პარამეტრები"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"სინქრონიზაციის პარამეტრები"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"ამ საქაღალდის სინქრონიზაცია"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"შეტყობინებები დაკავშირებისას ჩამოიტვირთება"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"ფოსტის სინქრონიზაციისათვის დღეების რაოდენობა"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"გამგზავნის სურათი"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"მხოლოდ ზოგ „Plus“ ანგარიშს აქვს წვდომა POP პროტოკოლზე, რომელიც პროგრამას დაკავშირების საშუალებას აძლევს. თუ თქვენ არ შეგიძლიათ თქვენი პაროლითა და ელფოსტის მისამართით ავტორიზაცია, ე.ი. არ იყენებთ „Plus“ ფასიან ანგარიშს. ელფოსტის ანგარიშებში შესასვლელად, გამოიყენოთ ვებ ბრაუზერი."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"ელფოსტის ანგარიშის დაყენებამდე ეწვიეთ T-Online-ს ვებ-გვერდს და შექმენით პაროლი POP3 ელფოსტაზე წვდომისთვის."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"კორპორატიული"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"ანგარიშის შექმნა ვერ მოხერხდა. სცადეთ ხელახლა."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"ელფოსტა"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"სერვერის უსაფრთხოების პოლიტიკის ჩართვა"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"პარამეტრები"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"ძირითადი პარამეტრები"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"დაადასტურეთ წაშლამდე"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"დაადასტურეთ გაგზავნამდე"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"ელფოსტის ძიება"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"აიკრძალოს მოწყობკობის კამერის გამოყენება"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"მოითხოვე მოწყობილობის პაროლი"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"გამოყენებული პაროლების ხელმეორედ გამოყენების აკრძალვა"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"კარგად ჟღერს!"</string>
     <string name="quick_3" msgid="8070999183033184986">"მოგვიანებით წავიკითხავ და დაგიბრუნდებით."</string>
     <string name="quick_4" msgid="216066940197616025">"ამის განსახილველად დავგეგმოთ პირისპირ შეხვედრა."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"ამ ანგარიშისთვის როუმინგისას ფონური სინქრონიზაცია გამორთულია"</string>
     <string name="confirm_response" msgid="6764021931370809514">"პასუხის გაგზავნა..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"პირადი (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"პირადი (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"წერილები არ არის."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"საქაღალდის ასარჩევი"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"სერვერზე წაშლილების საქაღალდის არჩევა <xliff:g id="ACCOUNT">%s</xliff:g>-ისთვის"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"აირჩიეთ სერვერის გაგზავნილების საქაღალდე ანგარიშისთვის: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <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>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
deleted file mode 100644
index 631a759..0000000
--- a/res/values-kk-rKZ/strings.xml
+++ /dev/null
@@ -1,298 +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">"Электрондық пошта тіркемелерін оқу"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"Қолданбаға сіздің электрондық пошта тіркемелеріңізді оқуға мүмкіндік береді"</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"Электрондық пошта провайдері деректеріне қатынас"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"Қолданбаға сіздің электрондық поштаңыздың дерекқорына, соның ішінде алынған хабарларға, жіберілген хабарларға, пайдаланушы аттарына және құпия сөздерге қатынасуға рұқсат береді."</string>
-    <string name="app_name" msgid="2206468539066258195">"Электрондық пошта"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Күйін келтіру"</string>
-    <string name="create_action" msgid="6575946089819721958">"Жаңасын жасау"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"Жылдам жауаптар жоқ."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"Есептік жазба параметрлері"</string>
-    <string name="status_network_error" msgid="526826323872477973">"Қосылым мәселесі."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"Хабарды жылжыту"</item>
-    <item quantity="other" msgid="5083310421670206821">"Хабарларды жылжыту"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 есептік жазбаларында жылжытуға қолдау көрсетілмейді."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Жылжыту мүмкін емес, өйткені таңдауда бірнеше есептік жазба бар."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"«Жоба жазбалар», «Шығыс» және «Жіберілгендер» қалталарындағы хабарларды жылжыту мүмкін емес."</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"«Кіріс» қалтасы"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Шығыс"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Жоба жазбалар"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"Себет"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"Жіберілген"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Қалаусыз"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Жұлдызшалы"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Оқылмаған"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"«Кіріс» қалтасы"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Жұлдызшалы"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Жоба жазбалар"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"«Шығыс» қалтасы"</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_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>
-    <string name="attachment_not_found" msgid="5219773045406833000">"Тіркемені жүктеу мүмкін болмады."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"Хабарды кодтан шығару кезінде қате пайда болды."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Бір немесе бірнеше тіркемені қайта жіберу мүмкін болмады."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"Тіркеме қайта жіберілмеді"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> жүйеге кіруі сәтсіз болды."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"Жүйеге кіру мүмкін болмады"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>Б"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>Б"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>КБ"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>КБ"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>МБ"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>МБ"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>ГБ"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>ГБ"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"Есептік жазбаны реттеу"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"Авторизация сұралуда"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"Кіру"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"Аутентификациялау мүмкін болмады"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"Электрондық пошта мекенжайы немесе құпия сөз дұрыс емес"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"Электрондық пошта мекенжайы:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"Электрондық пошта есептік жазбасы"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"Есептік жазбаны бар болғаны бірнеше қадаммен реттей аласыз."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"Электрондық пошта мекенжайы"</string>
-    <string name="or_label" msgid="6408695162723653446">"НЕМЕСЕ"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google арқылы кіру"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"ҚҰПИЯ СӨЗ"</string>
-    <string name="password_hint" msgid="4226682910292828279">"Құпия сөз"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s арқылы кірді"</string>
-    <string name="authentication_label" msgid="914463525214987772">"АУТЕНТИФИКАЦИЯ"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"Аутентификацияны қосу"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"Аутентификацияны тазалау"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"Қолмен реттеу"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Жарамды электрондық пошта мекенжайын немесе құпия сөзді теріңіз."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Есептік жазбаны көшірмелеу"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Сіз бұл пайдаланушы атын «<xliff:g id="DUPLICATE">%s</xliff:g>» есептік жазбасы үшін әлдеқашан пайдаландыңыз."</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"Бұл құпия сөз бір немесе бірнеше бос орынмен басталады немесе аяқталады. Серверлердің көбі бос орындары бар құпия сөздерді қолдамайды."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Есептік жазба ақпараты шығарып алынуда…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Сервер параметрлері тексерілуде…"</string>
-    <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_names_title" msgid="8780121351085082269">"Есептік жазбаны реттеу"</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>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Бұл өріс толтырылуы қажет."</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Есептік жазбаны реттеу"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Есептік жазба түрі"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Бұл есептік жазбаның түрі қандай?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Есептік жазбаны реттеу"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Кіріс сервер параметрлері"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ПАЙДАЛАНУШЫ АТЫ"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ҚҰПИЯ СӨЗ"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"Құпия сөз"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"СЕРВЕР"</string>
-    <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_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>
-    <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_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>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Есептік жазбаны реттеу"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Шығыс сервер параметрлері"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP СЕРВЕРІ"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ПОРТ"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ҚАУІПСІЗДІК ТҮРІ"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Жүйеге кіруді талап ету"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ПАЙДАЛАНУШЫ АТЫ"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ҚҰПИЯ СӨЗ"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"КЛИЕНТ СЕРТИФИКАТЫ"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Таңдау"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Клиент сертификатын пайдалану"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Жою"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Ешқандай"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"МОБИЛЬДІ ҚҰРЫЛҒЫНЫҢ ИДЕНТИФИКАТОРЫ"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"Есептік жазба параметрлері"</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_push" msgid="5511415696925307797">"Автоматты (Push)"</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>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"15 минут сайын"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"30 минут сайын"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"Сағат сайын"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"Электрондық пошта келген кезде хабарлау"</string>
-    <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">"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">"Aвтоматты"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"Соңғы күн"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"Соңғы үш күн"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"Соңғы апта"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"Соңғы екі апта"</string>
-    <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_fmt" msgid="8811464534757505457">"Жүйеге кіру сәтсіз аяқталды.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"Серверге қауіпсіз қосылу мүмкін болмады.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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_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>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"Сервер қосылымын ашу мүмкін болмады."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"Сервер мекенжайын дұрыс жазбадыңыз немесе сервер электрондық пошта қолдау көрсетпейтін протокол нұсқасын талап етеді."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"Бұл сервермен синхрондалуға рұқсат жоқ. Қосымша ақпарат алу үшін сервер әкімшісіне хабарласыңыз."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"Қашықтан қауіпсіздікті басқару"</string>
-    <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"Есептік жазбаның пайдаланушы атын өзгерте алмайсыз. Басқа пайдаланушы аты бар есептік жазбаны қосу үшін «Есептік жазба қосу» түймесін түртіңіз."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"ЕСКЕРТУ: «Электрондық пошта» қолданбасының құрылғыңызды басқару мүмкіндігін өшіру оны талап ететін барлық электрондық пошта есептік жазбаларын, соның ішінде, электрондық поштаны, контактілерді, күнтізбе оқиғаларын және басқа деректерді жояды."</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_change_title" msgid="615639963487448183">"Қауіпсіздік саясаттары өзгертілді"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"Қауіпсіздік саясаттарын сақтау мүмкін емес"</string>
-    <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>» бекіту экраныңыздың PIN кодын немесе құпия сөзін өзгертуді талап етеді."</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"Бекіту экранының құпия сөз мерзімі аяқталуда"</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">"Бекіту экраныңыздың 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> деректері құрылғыңыздан өшірілуде. Оны бекіту экранының PIN кодын немесе құпия сөзін өзгерту арқылы қалпына келтіре аласыз. Оны қазір өзгерткіңіз келе ме?"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Сақталмаған өзгерістерді жою қажет пе?"</string>
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Жүйеге кіру мүмкін болмады"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> үшін пайдаланушы аты немесе құпия сөз дұрыс емес. Оларды қазір жаңартқыңыз келе ме?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Сіздің <xliff:g id="ACCOUNT">%s</xliff:g> жүйесіне кіруіңіз сәтсіз болды; сервер келесіні хабарлады: <xliff:g id="REASON">%s</xliff:g> Пайдаланушы атын және/немесе құпия сөзді жаңартқыңыз келе ме?"</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>
-    <string name="account_settings_summary" msgid="4733776978291376161">"Синхрондау жиілігі, хабарландырулар, т.б."</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"Электрондық пошта келгенде хабарландыру жіберу"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"Синхрондау жиілігі"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"Кіріс параметрлері"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"Пайдаланушы аты, құпия сөз және басқа кіріс сервер параметрлері"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"Шығыс параметрлері"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"Түпнұсқалықты растау мүмкін болмады. Құпия сөзді қайта теріп, әрекетті қайталаңыз."</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"Қолданылған саясаттар"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"Ешқандай"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"Қолдау көрсетілмейтін саясаттар"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"Ешқандай"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"Синхрондау әрекеті"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"Бұл есептік жазбаны синхрондау үшін мына жерді түртіңіз"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"Есептік жазба аты"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"Сіздің атыңыз"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"Жылдам жауаптар"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"Эл. пошта хабарын құрған кезде жиі кірістіретін мәтінді өңдеу"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"Хабарландыру параметрлері"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"Дерекқорды пайдалану"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"Қауіпсіздік саясаттары"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"Жүйелік қалталар"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"Қоқыс қалтасы"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"Серверіңіздің қоқыс қалтасын таңдау"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"Серверіңіздің қоқыс қалтасын таңдау"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"Жіберілген элементтер қалтасы"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"Сервердің жіберілген элементтер қалтасын таңдау"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"Сервердің жіберілген элементтер қалтасын таңдау"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"Жылдам жауап"</string>
-    <string name="save_action" msgid="5740359453077441466">"Сақтау"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"Контактілерді синхрондау"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"Осы есептік жазба үшін контактілерді синхрондау"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"Күнтізбені синхрондау"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Осы есептік жазба үшін күнтізбе оқиғасын синхрондау"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Эл.поштаны синх-у"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Осы ес. жазба үшін эл. поштаны синх-у"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Дірілдеу"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"Рингтон таңдау"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"Сервер параметрлері"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Синхрондау опциялары"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"Синхрондау опциялары (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Осы қалтаны синхрондау"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Хабарлар қосылған кезде жүктеледі"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Пошта синхрондалуына қалған күндер"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Жіберуші суреті"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"Бұл бағдарламаның қосылуына рұқсат беретін POP қатынасын кейбір «Plus» есептік жазбалары ғана қамтиды. Егер сіз дұрыс электрондық пошта мекенжайыңызбен және құпия сөзіңізбен жүйеге кіре алмасаңыз, «Plus» есептік жазбасына төлемеген болуыңыз мүмкін. Осы электрондық пошта мекенжайларына қатынасқа ие болу үшін веб-браузерді іске қосыңыз."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"Осы электрондық пошта есептік жазбасын реттеместен бұрын, T-Online веб-торабына кіріп, POP3 электрондық пошта қатынасуға арналған құпия сөз жасаңыз."</string>
-    <string name="exchange_name" msgid="3793803477985438102">"Корпоративтік"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"Есептік жазба жасау мүмкін болмады. Әрекетті қайталаңыз."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"Электрондық пошта"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"Сервер анықтаған қауіпсіздік саясаттарын қосады"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"Параметрлер"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"Жалпы параметрлер"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Жоюдың алдында растау"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Жіберудің алдында растау"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"Электрондық поштадан іздеу"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Құрылғының камерасын пайдалануға рұқсат бермеу"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"Құрылғының құпия сөзін талап ету"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"Соңғы құпия сөздердің қайта пайдаланылуын шектеу"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"Құпия сөздердің мерзімін талап ету"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"Жұмыссыз тұрған құр-ң экранды бекітуін талап ету"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"Синхрондалған күнтізбе оқиғаларының санын шектеу"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"Синхрондалған электрондық хабарлар санын шектеу"</string>
-    <string name="quick_1" msgid="9130521670178673190">"Рақмет!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"Бұл маған ұнайды!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"Мен бұны кейірінек оқып, жауап беремін."</string>
-    <string name="quick_4" msgid="216066940197616025">"Бұны талқылау үшін кездесу ұйымдастырайық."</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"Роуминг кезінде бұл есептік жазбаның фондық режимде синхрондалуы өшіріледі."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"Жауап жіберілуде…"</string>
-    <string name="no_conversations" msgid="3785854971159919343">"Хабарлар жоқ."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"Қалтаны таңдау құралы"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> үшін сервердің қоқыс қалтасын таңдаңыз"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> үшін сер. жіб. эл-р қал. таң."</string>
-    <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Қалталар тізімі жүктелуде…"</string>
-    <string name="no_quick_responses" msgid="8716297053803961304">"Ешбірі қол жетімді емес"</string>
-    <!-- no translation found for gmail_name (2099786953868369991) -->
-    <skip />
-    <!-- no translation found for folder_sync_settings_pref_title (349478353401667107) -->
-    <skip />
-</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 4215c43..3cec6a8 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -21,6 +21,7 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"ចូល​ដំណើរ​ការ​ទិន្នន័យ​អ្នក​ផ្តល់​អ៊ីមែល"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"អនុញ្ញាត​​ឲ្យ​​កម្មវិធី​ដើម្បី​ចូល​ដំណើរការ​មូលដ្ឋាន​ទិន្នន័យ​អ៊ីមែល​របស់​អ្នក​ រួម​ទាំង​សារ​ដែល​បាន​ទទួល ​សារ​ដែល​បាន​ផ្ញើ ​ឈ្មោះ​អ្នក​ប្រើ ​និង​ពាក្យ​សម្ងាត់​។"</string>
     <string name="app_name" msgid="2206468539066258195">"អ៊ីមែល"</string>
+    <string name="debug_title" msgid="1337476992195531309">"កែ​កំហុស"</string>
     <string name="create_action" msgid="6575946089819721958">"បង្កើត​ថ្មី"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"មិន​មាន​ការ​ឆ្លើយ​តប​រហ័ស​។"</string>
     <string name="account_settings_action" msgid="589969653965674604">"ការ​កំណត់​គណនី"</string>
@@ -38,11 +39,28 @@
     <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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"មិន​អាច​ទាញ​យក​ឯកសារ​ភ្ជាប់​​។"</string>
     <string name="message_decode_error" msgid="91396461771444300">"មាន​កំហុស​មួយ​ខណៈ​ពេល​បំលែង​សារ។"</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"មិន​អាច​បញ្ជូន​បន្ត​ឯកសារ​ភ្ជាប់​មួយ​ ឬ​ច្រើន​។"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"មិន​បាន​បញ្ជូន​បន្ត​ឯកសារ​ភ្ជាប់"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ចូល​មិន​បាន​ជោគជ័យ។"</string>
     <string name="login_failed_title" msgid="1737884069957090004">"មិន​អាច​ចូល"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> បៃ"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> បៃ"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> គីឡូបៃ"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> គីឡូបៃ"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> មេកាបៃ"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> មេកាបៃ"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ជីកាបៃ"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ជីកាបៃ"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"រៀបចំ​គណនី"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"ស្នើសុំ​ការ​អនុញ្ញាត"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"ចូល"</string>
@@ -64,17 +82,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"វាយ​​បញ្ចូល​​ពាក្យ​សម្ងាត់ ​និង​​អាសយដ្ឋាន​អ៊ីមែល​​ដែល​ត្រឹមត្រូវ​។"</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"គណនី​ស្ទួន"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"អ្នក​បាន​កំពុង​ប្រើ​ឈ្មោះ​អ្នក​ប្រើ​នេះ​រួច​ហើយ​សម្រាប់​គណនី \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ។"</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"ពាក្យ​សម្ងាត់​នេះ​ចាប់​ផ្ដើម​ ឬ​បញ្ចប់​ជា​មួយ​​​តួអក្សរ​ដកឃ្លា​មួយ​ ឬ​ច្រើន​។ ម៉ាស៊ីន​មេ​​ជា​ច្រើន​មិន​គាំទ្រ​ពាក្យ​សម្ងាត់​​ដោយ​ប្រើ​ដំណ​​ក​ឃ្លា​ទេ​។"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"កំពុង​ទៅ​យក​ព័ត៌មាន​គណនី..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"កំពុង​ធ្វើ​សុពលភាព​ការ​កំណត់​ម៉ាស៊ីន​មេ..."</string>
     <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_names_title" msgid="8780121351085082269">"រៀបចំ​គណនី"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"វាល​នេះ​មិន​អាច​ទទេ​ឡើយ។"</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"រៀបចំ​គណនី"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"ប្រភេទ​គណនី"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"តើ​​គណនី​នេះ​ជា​ប្រភេទ​អ្វី?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"រៀបចំ​គណនី"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"ការ​កំណត់​ម៉ាស៊ីន​​មេ​ចូល"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ឈ្មោះ​អ្នក​ប្រើ"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ពាក្យសម្ងាត់"</string>
@@ -92,18 +115,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"រៀបចំ​គណនី"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"ការ​កំណត់​ម៉ាស៊ីន​​មេ​​ចេញ"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"ម៉ាស៊ីន​​មេ SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ច្រក​"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ប្រភេទ​​សុវត្ថិភាព"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"ទាមទារ​ឲ្យ​​ចូល"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ឈ្មោះ​អ្នក​ប្រើ"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ពាក្យសម្ងាត់"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"វិញ្ញាបនបត្រ​ម៉ាស៊ីន​កូន"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"ជ្រើសរើស"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"ប្រើ​វិញ្ញាបនបត្រ​ម៉ាស៊ីន​កូន"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"យក​ចេញ"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"គ្មាន"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"លេខ​សម្គាល់​ឧបករណ៍​ចល័ត"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"ការ​កំណត់​គណនី"</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>
@@ -129,6 +155,7 @@
     <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_fmt" msgid="8811464534757505457">"ការ​ចូល​បាន​បរាជ័យ​។\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +174,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"ការ​គ្រប់គ្រង​សុវត្ថិភាព​ពី​ចម្ងាយ"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"អ្នក​មិន​អាច​​ប្ដូរ​ឈ្មោះ​អ្នក​ប្រើ​របស់​គណនី​មួយ​។ ដើម្បី​បន្ថែម​គណនី​មួយ​ដោយ​ប្រើ​​​ឈ្មោះ​អ្នក​ប្រើ​ផ្សេង​គ្នា​​​ ប៉ះ​បន្ថែម​គណនី​។"</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"​ព្រមាន៖ ការ​ធ្វើ​ឲ្យ​អសកម្ម​ការ​អនុញ្ញាត​របស់​កម្មវិធី​អ៊ីមែល ​ដើម្បី​គ្រប់គ្រង​ឧបករណ៍​របស់​​អ្នក​​ នឹង​លុប​គណនី​អ៊ីមែល​ទាំង​អស់​ដែល​​ទាមទារ​វា ​រួម​ជាមួយ​អ៊ីមែល​​ ​ទំនាក់​ទំនង ព្រឹត្តិការណ៍​ប្រតិទិន ​និង​ទិន្នន័យ​ផ្សេង​ទៀត​។"</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>
@@ -168,6 +196,9 @@
     <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> នឹង​​ត្រូវ​បាន​លុប​ចេញ​ពី​ឧបករណ៍​របស់​អ្នក​។ អ្នក​អាច​ស្ដារ​វា​ដោយ​ប្ដូរ​កូដ PIN ចាក់​សោ​អេក្រង់​ ឬ​ពាក្យ​សម្ងាត់​របស់​អ្នក។ តើ​អ្នក​ចង់​ប្ដូរ​​វា​ឥឡូវ​នេះ​ទេ?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"បោះបង់​ការ​ផ្លាស់ប្ដូរ​​ដែល​មិន​បាន​រក្សាទុក?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"មិន​អាច​ចូល"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"ឈ្មោះ​អ្នក​ប្រើ ​ឬ​ពាក្យ​សម្ងាត់​សម្រាប់ <xliff:g id="ACCOUNT">%s</xliff:g> គឺ​មិន​ត្រឹមត្រូវ​។ តើ​អ្នក​ចង់​ធ្វើ​បច្ចុប្បន្នភាព​វា​ឥឡូវ​នេះ​ឬ?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"ការ​ចូល​​​ <xliff:g id="ACCOUNT">%s</xliff:g> របស់​អ្នក​បាន​បរាជ័យ ម៉ាស៊ីន​មេ​បាន​បង្ហាញ​ថា៖ <xliff:g id="REASON">%s</xliff:g> តើ​អ្នក​ចង់​ធ្វើ​បច្ចុប្បន្នភាព​ឈ្មោះ​អ្នក​ប្រើ និង/​ឬ ពាក្យ​សម្ងាត់​របស់​អ្នក​ទេ?"</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_notify_label" msgid="8621226576645167987">"ការ​ជូន​ដំណឹង​អ៊ីមែល"</string>
@@ -206,7 +237,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ធ្វើ​សមកាលកម្ម​ព្រឹត្តិការណ៍​ប្រតិទិន​សម្រាប់​​គណនី​នេះ"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ធ្វើ​សម​កាល​កម្ម​អ៊ីមែល"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ធ្វើ​សម​កាល​កម្ម​អ៊ីមែល​សម្រាប់​គណនី​នេះ"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"ញ័រ"</string>
+    <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"ញ័រ"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"ជ្រើស​សំឡេង​រោទ៍"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"ការ​កំណត់​ម៉ាស៊ីន​មេ"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"ជម្រើស​សម​កាល​កម្ម"</string>
@@ -214,7 +245,10 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"ធ្វើ​សម​កាល​កម្ម​ថត​នេះ"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"សារ​នឹង​ទាញ​យក​នៅ​ពេល​​តភ្ជាប់"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"ថ្ងៃ​ដែល​សំបុត្រ​​ត្រូវ​ធ្វើ​សម​កាល​កម្ម"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"រូបភាព​អ្នក​ផ្ញើ"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"មាន​​​តែ​គណនី \"Plus\" មួយ​ចំនួនប៉ុណ្ណោះ រួម​បញ្ចូល​នូវ​ការ​ចូល​ដំណើរ​ការ POP អនុញ្ញាត​​ឲ្យ​​កម្មវិធី​នេះ​ត្រូវ​​តភ្ជាប់​។ ​បើ​អ្នក​មិន​អាច​ចុះ​ហត្ថលេខា​​ដោយ​ប្រើ​​អាសយដ្ឋាន​អ៊ីមែល​ត្រឹមត្រូវ​និង​ពាក្យ​សម្ងាត់​របស់​អ្នក អ្នក​ប្រហែល​ជា​មិន​​ចាំបាច់​បង់​ប្រាក់​​គណនី \"Plus\" ទេ។ បើក​ដំណើរការ​កម្មវិធី​អ៊ីនធឺណិត​បណ្ដាញ​ដើម្បី​ទទួល​បាន​នូវ​ការ​ចូល​ដំណើរ​ការ​ទៅ​កាន់​គណនី​អ៊ីមែល​ទាំងនេះ​។"</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"មុន​ពេល​រៀបចំ​គណនី​អ៊ីមែល​​នេះ សូម​​មើល​តំបន់​បណ្ដាញ T-Online ហើយ​​បង្កើត​ពាក្យ​សម្ងាត់​សម្រាប់​ចូល​ដំណើរ​ការ​អ៊ីមែល POP3 ។"</string>
+    <string name="exchange_name" msgid="3793803477985438102">"សហការ"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"មិន​អាច​បង្កើត​គណនី​។ សូម​ព្យាយាម​ម្ដងទៀត។"</string>
     <string name="device_admin_label" msgid="3335272972461391415">"អ៊ីមែល"</string>
@@ -230,6 +264,7 @@
     <string name="quick_2" msgid="8611591278119481491">"ល្អ​ចំពោះ​ខ្ញុំ​!"</string>
     <string name="quick_3" msgid="8070999183033184986">"ខ្ញុំ​នឹង​​អាន​នៅ​ពេល​ក្រោយ និង​ឆ្លើយតប​​អ្នក​វិញ។"</string>
     <string name="quick_4" msgid="216066940197616025">"​រៀបចំ​កិច្ច​ប្រជុំ​​​​​ ដើម្បី​ពិភាក្សា​រឿង​នេះ​។"</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"បាន​បិទ​ការ​ធ្វើ​សម​កាល​កម្ម​ផ្ទៃ​ខាង​ក្រោយ​សម្រាប់​គណនី​នេះ​​​ខណៈ​ពេល​នៅ​ក្រៅ​ប្រទេស។"</string>
     <string name="confirm_response" msgid="6764021931370809514">"កំពុង​ផ្ញើ​​ការ​ឆ្លើយ​តប..."</string>
     <string name="imap_name" msgid="8285222985908214985">"ផ្ទាល់​ខ្លួន (IMAP​)"</string>
     <string name="pop3_name" msgid="6653484706414263493">"ផ្ទាល់​ខ្លួន (POP3​)"</string>
@@ -238,5 +273,4 @@
     <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>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
deleted file mode 100644
index 0d8043e..0000000
--- a/res/values-kn-rIN/strings.xml
+++ /dev/null
@@ -1,296 +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">"ಇಮೇಲ್ ಲಗತ್ತುಗಳನ್ನು ಓದಿ"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"ನಿಮ್ಮ Gmail ಲಗತ್ತುಗಳು ಅನ್ನು ಓದಲು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಅನುಮತಿಸುತ್ತದೆ."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"ಇಮೇಲ್ ಪೂರೈಕೆದಾರರ ಡೇಟಾ ಪ್ರವೇಶಿಸಿ"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"ಒಳಬರುವ ಸಂದೇಶಗಳು, ಕಳುಹಿಸಿದ ಸಂದೇಶಗಳು, ಬಳಕೆದಾರಹೆಸರುಗಳು, ಮತ್ತು ಪಾಸ್‍‍ವರ್ಡ್‍ಗಳನ್ನು ಒಳಗೊಂಡಿರುವಂತೆ, ನಿಮ್ಮ ಇಮೇಲ್ ಡೇಟಾಬೇಸ್ ಅನ್ನು ಪ್ರವೇಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್‍‍ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ."</string>
-    <string name="app_name" msgid="2206468539066258195">"ಇಮೇಲ್"</string>
-    <string name="debug_title" msgid="1337476992195531309">"ಡೀಬಗ್ ಮಾಡಿ"</string>
-    <string name="create_action" msgid="6575946089819721958">"ಹೊಸತನ್ನು ರಚಿಸು"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆ ಇಲ್ಲ."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"ಖಾತೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="status_network_error" msgid="526826323872477973">"ಸಂಪರ್ಕದ ತೊಂದರೆ."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"ಸಂದೇಶ ಸರಿಸು"</item>
-    <item quantity="other" msgid="5083310421670206821">"ಸಂದೇಶಗಳನ್ನು ಸರಿಸು"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 ಖಾತೆಗಳಲ್ಲಿ ಸರಿಸು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"ಆಯ್ಕೆಯು ಬಹು ಖಾತೆಗಳನ್ನು ಒಳಗೊಂಡಿರುವ ಕಾರಣ ಸರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"ಡ್ರಾಫ್ಟ್‌ಗಳು, ಔಟ್‌ಬಾಕ್ಸ್‌ನಲ್ಲಿರುವ ಮತ್ತು ಕಳುಹಿಸಿದ ಸಂದೇಶಗಳನ್ನು ಸರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"ಇನ್‌ಬಾಕ್ಸ್‌‌"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"ಔಟ್‌ಬಾಕ್ಸ್‌‌"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"ಡ್ರಾಫ್ಟ್‌‌ಗಳು"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"ಅನುಪಯುಕ್ತ"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"ಕಳುಹಿಸಲಾಗಿದೆ"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"ಜಂಕ್‌"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"ನಕ್ಷತ್ರ ಹಾಕಿರುವುದು"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"ಓದದಿರುವುದು"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"ಇನ್‌ಬಾಕ್ಸ್‌‌"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"ನಕ್ಷತ್ರ ಹಾಕಿರುವುದು"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"ಡ್ರಾಫ್ಟ್‌‌ಗಳು"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"ಔಟ್‌ಬಾಕ್ಸ್‌‌"</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>\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>
-    <string name="attachment_not_found" msgid="5219773045406833000">"ಲಗತ್ತನ್ನು ಡೌನಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"ಸಂದೇಶವನ್ನು ಡೀಕೋಡ್ ಮಾಡುವಾಗ ದೋಷವುಂಟಾಗಿದೆ."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"ಒಂದು ಅಥವಾ ಹೆಚ್ಚಿನ ಲಗತ್ತುಗಳನ್ನು ಫಾರ್ವರ್ಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"ಲಗತ್ತನ್ನು ಫಾರ್ವರ್ಡ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ಸೈನ್‍ಇನ್ ಯಶಸ್ವಿಯಾಗಿಲ್ಲ."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"ಸೈನ್ ಇನ್ ಮಾಡಲಾಗಲಿಲ್ಲ"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"ಖಾತೆ ಹೊಂದಿಸುವಿಕೆ"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"ಪ್ರಮಾಣೀಕರಣ ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"ಸೈನ್ ಇನ್ ಮಾಡು"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"ದೃಢೀಕರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"ಇಮೇಲ್ ವಿಳಾಸ ಅಥವಾ ಪಾಸ್‍ವರ್ಡ್ ತಪ್ಪಾಗಿದೆ"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"ಇಮೇಲ್ ವಿಳಾಸ:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"ಇಮೇಲ್ ಖಾತೆ"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"ನೀವು ಒಂದೆರಡು ಹಂತಗಳಲ್ಲಿ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಹೊಂದಿಸಬಹುದು."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"ಇಮೇಲ್ ವಿಳಾಸ"</string>
-    <string name="or_label" msgid="6408695162723653446">"OR"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google ಜೊತೆ ಸೈನ್ ಇನ್ ಮಾಡಿ"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="password_hint" msgid="4226682910292828279">"ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s ಜೊತೆ ಸೈನ್‍ಇನ್ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="authentication_label" msgid="914463525214987772">"ದೃಢೀಕರಣ"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"ದೃಢೀಕರಣವನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"ದೃಢೀಕರಣವನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"ಹಸ್ತಚಾಲಿತ ಹೊಂದಿಸುವಿಕೆ"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"ಮಾನ್ಯವಾಗಿರುವ ಇಮೇಲ್ ವಿಳಾಸ ಮತ್ತು ಪಾಸ್‍ವರ್ಡ್ ಟೈಪ್ ಮಾಡಿ."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"ನಕಲಿ ಖಾತೆ"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"ನೀವು ಈಗಾಗಲೇ \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ಖಾತೆಗಾಗಿ ಈ ಬಳಕೆದಾರನ ಹೆಸರನ್ನು ಬಳಸುತ್ತಿರುವಿರಿ."</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"ಈ ಪಾಸ್‍‍ವರ್ಡ್ ಒಂದು ಅಥವಾ ಹೆಚ್ಚಿನ ಸ್ಪೇಸ್ ಅಕ್ಷರಗಳೊಂದಿಗೆ ಆರಂಭವಾಗುತ್ತದೆ ಅಥವಾ ಕೊನೆಗೊಳ್ಳುತ್ತದೆ. ಅನೇಕ ಸರ್ವರ್‍‍ಗಳು ಸ್ಪೇಸ್‍‍ಗಳನ್ನು ಹೊಂದಿರುವ ಪಾಸ್‍‍ವರ್ಡ್‌ಗಳನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"ಖಾತೆಯ ಮಾಹಿತಿಯನ್ನು ಹಿಂಪಡೆಯಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ಪ್ರಮಾಣೀಕರಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <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_names_title" msgid="8780121351085082269">"ಖಾತೆ ಹೊಂದಿಸುವಿಕೆ"</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>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"ಈ ಕ್ಷೇತ್ರವನ್ನು ಖಾಲಿ ಬಿಡಬಾರದು."</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"ಖಾತೆ ಹೊಂದಿಸುವಿಕೆ"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"ಖಾತೆ ವಿಧಾನ"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"ಇದು ಯಾವ ವಿಧದ ಖಾತೆಯಾಗಿದೆ?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"ಖಾತೆ ಹೊಂದಿಸುವಿಕೆ"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"ಒಳಬರುವ ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍ಗಳು"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ಬಳಕೆದಾರಹೆಸರು"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"ಸರ್ವರ್"</string>
-    <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_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>
-    <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_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>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"ಖಾತೆ ಹೊಂದಿಸುವಿಕೆ"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"ಹೊರಹೋಗುವ ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍ಗಳು"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP ಸರ್ವರ್"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ಪೋರ್ಟ್"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ಭದ್ರತೆ ಪ್ರಕಾರ"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"ಸೈನ್ ಇನ್ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ಬಳಕೆದಾರಹೆಸರು"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"ಗ್ರಾಹಕ ಪ್ರಮಾಣಪತ್ರ"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"ಗ್ರಾಹಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಬಳಸಿ"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"ತೆಗೆದುಹಾಕಿ"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ಮೊಬೈಲ್ ಸಾಧನ ID"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"ಖಾತೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</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_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>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"ಪ್ರತಿ 15 ನಿಮಿಷಗಳಿಗೆ"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"ಪ್ರತಿ 30 ನಿಮಿಷಗಳಿಗೆ"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"ಪ್ರತಿ ಗಂಟೆ"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"ಇಮೇಲ್ ಬಂದಾಗ ನನಗೆ ಸೂಚಿನೆ ನೀಡು"</string>
-    <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">"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>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"ಕೊನೆಯ ದಿನ"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"ಕೊನೆಯ ಮೂರು ದಿನಗಳು"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"ಕೊನೆಯ ವಾರ"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"ಕಳೆದ ಎರಡು ವಾರಗಳು"</string>
-    <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_fmt" msgid="8811464534757505457">"ಲಾಗಿನ್ ವಿಫಲವಾಗಿದೆ.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"ಸುರಕ್ಷಿತವಾಗಿ ಸರ್ವರ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುವುದಿಲ್ಲ.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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_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>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕವನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"ನೀವು ತಪ್ಪಾಗಿರುವ ಸರ್ವರ್ ವಿಳಾಸವನ್ನು ಟೈಪ್ ಮಾಡಿರುವಿರಿ ಅಥವಾ ಇಮೇಲ್ ಬೆಂಬಲಿಸದ ಪ್ರೋಟೋಕಾಲ್ ಆವೃತ್ತಿಯು ಸರ್ವರ್‌ಗೆ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"ನಿವು ಈ ಸರ್ವರ್‍‍ನೊಂದಿಗೆ ಸಿಂಕ್ ಮಾಡುವ ಅನುಮತಿಯನ್ನು ಹೊಂದಿಲ್ಲ. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ ನಿಮ್ಮ ಸರ್ವರ್‍‍ನ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"ಭದ್ರತಾ ನಿರ್ವಹಣೆಯನ್ನು ರಿಮೋಟ್ ಮಾಡಿ"</string>
-    <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"ನೀವು ಖಾತೆಯ ಬಳಕೆದಾರಹೆಸರನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಬೇರೆ ಬಳಕೆದಾರಹೆಸರಿನ ಖಾತೆಯನ್ನು ಸೇರಿಸಲು, ಖಾತೆ ಸೇರಿಸು ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"ಎಚ್ಚರಿಕೆ: ನಿಮ್ಮ ಸಾಧನವನ್ನು ನಿರ್ವಹಿಸಲು ಇಮೇಲ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಕಾರವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಅವುಗಳ ಇಮೇಲ್, ಸಂಪರ್ಕಗಳು, ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್‌ಗಳು, ಮತ್ತು ಇತರೆ ಡೇಟಾ ಸೇರಿದಂತೆ ಎಲ್ಲಾ ಅಗತ್ಯವಿರುವ ಇಮೇಲ್ ಖಾತೆಗಳನ್ನು ಅಳಿಸುತ್ತದೆ."</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_change_title" msgid="615639963487448183">"ಭದ್ರತಾ ನೀತಿಗಳನ್ನು ಬದಲಿಸಲಾಗಿದೆ"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"ಭದ್ರತಾ ನೀತಿಗಳನ್ನು ಪೂರೈಸಲಾಗಲಿಲ್ಲ"</string>
-    <string name="account_security_title" msgid="6072273231606918870">"ಸಾಧನ ಭದ್ರತೆ"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="2527501853520160827">"ನಿಮ್ಮ Android ಸಾಧನದ ಕೆಲವು ಭದ್ರತಾ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ದೂರದಿಂದಲೇ ನಿಯಂತ್ರಿಸಲು <xliff:g id="SERVER">%s</xliff:g> ಸರ್ವರ್ ಗೆ ನೀವು ಅನುಮತಿಸುವ ಅಗತ್ಯವಿದೆ."</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>\" ನಿಮ್ಮ ಪರದೆ ಲಾಕ್ PIN ಅಥವಾ ಪಾಸ್‍‍ವರ್ಡ್ ಅನ್ನು ನೀವು ಬದಲಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"ಪರದೆಲಾಕ್ ಪಾಸ್‍ವರ್ಡ್ ಅವಧಿಮೀರಿದೆ"</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">"ನಿಮ್ಮ ಪರದೆ ಲಾಕ್ 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> ಗಾಗಿ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ. ನಿಮ್ಮ ಪರದೆ ಲಾಕ್ PIN ಅಥವಾ ಪಾಸ್‍‍ವರ್ಡ್ ಅನ್ನು ಬದಲಿಸುವ ಮೂಲಕ ಅದನ್ನು ನೀವು ಮರುಸ್ಥಾಪಿಸಬಹುದು. ಇದೀಗ ನೀವು ಅದನ್ನು ಬದಲಿಸಲು ಬಯಸುವಿರಾ?"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"ಉಳಿಸಲಾಗದ ಬದಲಾವಣೆಗಳನ್ನು ತಿರಸ್ಕರಿಸುವುದೇ?"</string>
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"ಸೈನ್ ಇನ್ ಮಾಡಲಾಗಲಿಲ್ಲ"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> ಖಾತೆಗಾಗಿ ಬಳಕೆದಾರಹೆಸರು ಅಥವಾ ಪಾಸ್‍‍ವರ್ಡ್ ತಪ್ಪಾಗಿದೆ. ಇದೀಗ ನೀವು ಅವುಗಳನ್ನು ನವೀಕರಿಸಲು ಬಯಸುವಿರಾ?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"ನಿಮ್ಮ <xliff:g id="ACCOUNT">%s</xliff:g> ಲಾಗಿನ್ ವಿಫಲವಾಗಿದೆ; ಸರ್ವರ್ ಹೇಳುತ್ತಿದೆ: <xliff:g id="REASON">%s</xliff:g> ನಿಮ್ಮ ಬಳಕೆದಾರಹೆಸರು ಮತ್ತು/ಅಥವಾ ಪಾಸ್‍‍ವರ್ಡ್ ಅನ್ನು ನವೀಕರಿಸಲು ನೀವು ಬಯಸುವಿರಾ?"</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>
-    <string name="account_settings_summary" msgid="4733776978291376161">"ಆವರ್ತನ, ಅಧಿಸೂಚನೆಗಳು ಇತ್ಯಾದಿಯನ್ನು ಸಿಂಕ್ ಮಾಡಿ."</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"ಇಮೇಲ್ ಬಂದಾಗ ಅಧಿಸೂಚನೆಯನ್ನು ಕಳುಹಿಸು"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"ಆವರ್ತನವನ್ನು ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"ಒಳಬರುವ ಸೆಟ್ಟಿಂಗ್‍ಗಳು"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"ಬಳಕೆದಾರನಹೆಸರು, ಪಾಸ್‍‍ವರ್ಡ್, ಮತ್ತು ಇತರೆ ಒಳಬರುವ ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍‍ಗಳು"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"ಹೊರಹೋಗುವ ಸೆಟ್ಟಿಂಗ್‍ಗಳು"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"ಬಳಕೆದಾರನಹೆಸರು, ಪಾಸ್‍‍ವರ್ಡ್ ಮತ್ತು ಇತರೆ ಹೊರಹೋಗುವ ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍‍ಗಳು"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"ಜಾರಿಗೊಳಿಸಿರುವ ನೀತಿಗಳು"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"ಬೆಂಬಲಿತವಲ್ಲದ ನೀತಿಗಳು"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"ಸಿಂಕ್ ಪ್ರಯತ್ನಿಸಿ"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"ಈ ಖಾತೆಯನ್ನು ಸಿಂಕ್ ಮಾಡಲು ಇಲ್ಲಿ ಸ್ಪರ್ಶಿಸಿ"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"ಖಾತೆ ಹೆಸರು"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"ನಿಮ್ಮ ಹೆಸರು"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆಗಳು"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"ಇಮೇಲ್ ಅನ್ನು ಸಂಯೋಜಿಸುತ್ತಿರುವಾಗ ನೀವು ಪದೇ ಪದೇ ಸೇರಿಸುವಂತಹ ಪಠ್ಯವನ್ನು ಸಂಪಾದಿಸಿ"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"ಡೇಟಾ ಬಳಕೆ"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"ಭದ್ರತಾ ನೀತಿಗಳು"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"ಸಿಸ್ಟಮ್ ಫೋಲ್ಡರ್‌ಗಳು"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"ಅನುಪಯುಕ್ತ ಫೋಲ್ಡರ್"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"ನಿಮ್ಮ ಸರ್ವರ್‍ನ ಅನುಪಯುಕ್ತ ಫೋಲ್ಡರ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"ನಿಮ್ಮ ಸರ್ವರ್‍ನ ಅನುಪಯುಕ್ತ ಫೋಲ್ಡರ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"ಕಳುಹಿಸಿದ ಐಟಮ್‌ಗಳ ಫೋಲ್ಡರ್"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"ನಿಮ್ಮ ಸರ್ವರ್ ನ ಕಳುಹಿಸಿದ ಐಟಮ್ ಫೋಲ್ಡರ್‍ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"ನಿಮ್ಮ ಸರ್ವರ್‌ನ ಕಳುಹಿಸಿದ ಐಟಮ್ ಫೋಲ್ಡರ್‍ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆ"</string>
-    <string name="save_action" msgid="5740359453077441466">"ಉಳಿಸು"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"ಸಂಪರ್ಕ ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"ಈ ಖಾತೆಗಾಗಿ ಸಂಪರ್ಕಗಳನ್ನು ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"ಕ್ಯಾಲೆಂಡರ್ ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ಈ ಖಾತೆಗಾಗಿ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್ ಅನ್ನು ಸಿಂಕ್ ಮಾಡು"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ಇಮೇಲ್ ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ಈ ಖಾತೆಗಾಗಿ ಇಮೇಲ್ ಅನ್ನು ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"ವೈಬ್ರೇಟ್‌"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"ರಿಂಗ್‍ಟೋನ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍ಗಳು"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"ಸಿಂಕ್‌ ಆಯ್ಕೆಗಳು"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"ಸಿಂಕ್ ಆಯ್ಕೆಗಳು (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"ಈ ಫೋಲ್ಡರ್ ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"ಸಂಪರ್ಕಗೊಂಡಾಗ ಸಂದೇಶಗಳು ಡೌನ್‍ಲೋಡ್ ಆಗುತ್ತವೆ"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"ಸಿಂಕ್ ಮಾಡಲು ಮೇಲ್ ದಿನಗಳು"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"ಕಳುಹಿಸುವವರ ಚಿತ್ರ"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"ಕೆಲವು \"Plus\" ಖಾತೆಗಳು ಮಾತ್ರ ಈ ಕಾರ್ಯಕ್ರಮಕ್ಕೆ ಸಂಪರ್ಕಿಸಲು ಅನುಮತಿಸುವ POP ಪ್ರವೇಶವನ್ನು ಒಳಗೊಂಡಿವೆ. ನಿಮ್ಮ ಸರಿಯಾದ ಇಮೇಲ್ ವಿಳಾಸ ಮತ್ತು ಪಾಸ್‍‍ವರ್ಡ್‌ನೊಂದಿಗೆ ಸೈನ್‍‍ಇನ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗದಿದ್ದರೇ, ನೀವು ಪಾವತಿಸಿದ \"Plus\" ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲದಿರಬಹುದು. ಈ ಇಮೇಲ್ ಖಾತೆಗಳಿಗೆ ಪ್ರವೇಶವನ್ನು ಪಡೆಯಲು ವೆಬ್ ಬ್ರೌಸರ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಿ."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"ಈ ಇಮೇಲ್ ಖಾತೆಯನ್ನು ಹೊಂದಿಸುವ ಮೊದಲು, T-Online ವೆಬ್‍‍ಸೈಟ್‍‍ಗೆ ಬೇಟಿ ನೀಡಿ ಮತ್ತು POP3 ಇಮೇಲ್ ಪ್ರವೇಶಕ್ಕಾಗಿ ಪಾಸ್‍‍ವರ್ಡ್ ರಚಿಸಿ."</string>
-    <string name="exchange_name" msgid="3793803477985438102">"ಸಂಸ್ಥೆ"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"ಖಾತೆಯನ್ನು ರಚಿಸಲಾಗಲಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"ಇಮೇಲ್"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"ಸರ್ವರ್-ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಭದ್ರತಾ ನೀತಿಗಳನ್ನು ಸಕ್ರಿಗೊಳಿಸುತ್ತದೆ"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"ಸಾಮಾನ್ಯ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"ಅಳಿಸುವ ಮೊದಲು ದೃಢೀಕರಿಸಿ"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"ಕಳುಹಿಸುವ ಮೊದಲು ದೃಢೀಕರಿಸಿ"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"ಇಮೇಲ್ ಹುಡುಕಿರಿ"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"ಸಾಧನಗಳ ಕ್ಯಾಮೆರಾದ ಬಳಕೆಯನ್ನು ಅನುಮತಿಸಬೇಡ"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"ಸಾಧನ ಪಾಸ್‍ವರ್ಡ್ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"ಇತ್ತೀಚಿನ ಪಾಸ್‍ವರ್ಡ್‌ಗಳ ಮರುಬಳಕೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"ಮುಕ್ತಾಯವಾಗಲು ಪಾಸ್‍ವರ್ಡ್ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"ಇದರ ಪರದೆಯನ್ನು ಲಾಕ್ ಮಾಡಲು ತಟಸ್ಥ ಸಾಧನದ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"ಸಿಂಕ್ ಮಾಡಲಾದ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್‍ಗಳ ಸಂಖ್ಯೆಯನ್ನು ಮಿತಿಗೊಳಿಸಿ"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"ಸಿಂಕ್ ಮಾಡಲಾದ ಇಮೇಲ್‍ಗಳ ಸಂಖ್ಯೆಯನ್ನು ಮಿತಿಗೊಳಿಸಿ"</string>
-    <string name="quick_1" msgid="9130521670178673190">"ಧನ್ಯವಾದ!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"ಶಬ್ದ ಮಾಡುವುದು ನನಗೆ ಇಷ್ಟವಾಗುತ್ತದೆ!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"ನಾನು ಇದನ್ನು ನಂತರ ಓದುತ್ತೇನೆ ಮತ್ತು ನಿಮಗೆ ಪ್ರತ್ಯುತ್ತರಿಸುತ್ತೇನೆ."</string>
-    <string name="quick_4" msgid="216066940197616025">"ಇದನ್ನು ಚರ್ಚಿಸಲು ಒಂದು ಸಭೆಯನ್ನು ಹೊಂದಿಸೋಣ."</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"ರೋಮ್ ಮಾಡುವಾಗ ಈ ಖಾತೆಗಾಗಿ ಹಿನ್ನೆಲೆ ಸಿಂಕ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="no_conversations" msgid="3785854971159919343">"ಸಂದೇಶಗಳಿಲ್ಲ."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"ಫೋಲ್ಡರ್ ಪಿಕ್ಕರ್"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> ಖಾತೆಗಾಗಿ ಸರ್ವರ್ ನ ಅನುಪಯುಕ್ತ ಫೋಲ್ಡರ್ ಅನ್ನು ಆರಿಸಿ"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> ಖಾತೆಗಾಗಿ ಸರ್ವರ್ ನ ಕಳುಹಿಸಿದ ಐಟಂಗಳ ಫೋಲ್ಡರ್ ಅನ್ನು ಆರಿಸಿ"</string>
-    <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>
-</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b892e07..3a2d9fa 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"이메일 제공업체 데이터 액세스"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"앱이 받은 메일, 보낸 메일, 사용자 이름 및 비밀번호를 포함하는 이메일 데이터베이스에 액세스하도록 허용합니다."</string>
     <string name="app_name" msgid="2206468539066258195">"이메일"</string>
+    <string name="debug_title" msgid="1337476992195531309">"디버그"</string>
     <string name="create_action" msgid="6575946089819721958">"새로 만들기"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"빠른 응답이 없습니다."</string>
     <string name="account_settings_action" msgid="589969653965674604">"계정 설정"</string>
+    <string name="status_network_error" msgid="526826323872477973">"연결에 문제가 있습니다."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"메일 이동"</item>
+    <item quantity="other" msgid="5083310421670206821">"메일 이동"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 계정에서는 메일 이동이 지원되지 않습니다."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"선택하신 메일에 여러 계정이 포함되어 있어 이동할 수 없습니다."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"임시보관함, 보낼편지함, 보낸편지함의 메일은 이동할 수 없습니다."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"받은편지함"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"보낼편지함"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"임시보관함"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"스팸"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"별표편지함"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"읽지않음"</string>
-    <string name="debug_title" msgid="1337476992195531309">"디버그"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"받은편지함"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"별표편지함"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"임시보관함"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"보낼편지함"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"첨부파일을 다운로드할 수 없습니다."</string>
     <string name="message_decode_error" msgid="91396461771444300">"메일을 디코딩하는 동안 오류가 발생했습니다."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"하나 이상의 첨부파일을 전달하지 못했습니다."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"첨부파일을 전달하지 못했습니다."</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>에 로그인하지 못했습니다."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"로그인하지 못했습니다."</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"계정 설정"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"승인 요청 중"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"로그인"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"올바른 이메일 주소와 비밀번호를 입력하세요."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"중복 계정"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"이미 \'<xliff:g id="DUPLICATE">%s</xliff:g>\' 계정에 이 사용자 이름을 사용하고 있습니다."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"비밀번호의 시작 또는 끝에 하나 이상의 공백 문자가 있습니다. 서버 중에는 공백이 포함된 비밀번호를 지원하지 않는 것이 많습니다."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"계정 정보 검색 중..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"서버 설정 확인 중…"</string>
     <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_names_title" msgid="8780121351085082269">"계정 설정"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"이 입력란은 비워 둘 수 없습니다."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"계정 설정"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"계정 유형"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"계정 유형이 무엇입니까?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"계정 설정"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"수신 서버 설정"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"사용자 이름"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"비밀번호"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"계정 설정"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"발신 서버 설정"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP 서버"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"포트"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"보안 유형"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"로그인 필요"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"사용자 이름"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"비밀번호"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"클라이언트 인증서"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"선택"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"클라이언트 인증서 사용"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"삭제"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"선택 취소"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"휴대기기 ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"계정 설정"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"로그인하지 못했습니다.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"원격 보안 관리"</string>
     <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">"이 서버는 <xliff:g id="ERROR">%s</xliff:g> 등 Android 기기가 지원하지 않는 보안 기능을 필요로 합니다."</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"계정 사용자 이름을 변경할 수 없습니다. 다른 사용자 이름으로 계정을 추가하려면 \'계정 추가\'를 터치하세요."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"경고: 이메일 앱의 기기 관리 권한을 비활성화하면 관련된 모든 이메일 계정 및 이메일, 주소록, 캘린더 일정 및 기타 데이터가 모두 삭제됩니다."</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>
@@ -168,6 +207,9 @@
     <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>의 데이터가 기기에서 지워졌습니다. 화면 잠금 PIN 또는 비밀번호를 변경하면 데이터를 복구할 수 있습니다. 지금 변경하시겠습니까?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"저장되지 않은 변경사항을 삭제하시겠습니까?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"로그인하지 못했습니다."</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g>의 사용자 이름 또는 비밀번호가 잘못되었습니다. 지금 업데이트하시겠습니까?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"<xliff:g id="ACCOUNT">%s</xliff:g>에 로그인하지 못했습니다. 이유는 다음과 같습니다: <xliff:g id="REASON">%s</xliff:g> 사용자 이름 또는 비밀번호를 업데이트하시겠습니까?"</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>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"이 계정의 캘린더 일정을 동기화합니다."</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"이메일 동기화"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"이 계정의 이메일을 동기화합니다."</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"진동"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"진동"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"벨소리 선택"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"서버 설정"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"동기화 옵션"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"이 폴더 동기화"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"연결되면 메일이 다운로드됩니다."</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"메일 동기화 일 수"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"발신자 이미지"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"일부 \'Plus\' 계정에만 이 프로그램에 연결할 수 있는 POP 액세스 권한이 있습니다. 올바른 이메일 주소와 비밀번호를 입력해도 로그인이 되지 않으면 유료 \'Plus\' 계정이 없기 때문일 수 있습니다. 이러한 이메일 계정에 액세스하려면 웹브라우저를 실행하세요."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"이메일 계정을 설정하기 전에 T-Online 웹사이트를 방문하고 POP3 이메일 액세스용 비밀번호를 만드세요."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Exchange 계정"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"계정을 만들지 못했습니다. 다시 시도해 주세요."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"이메일"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"서버별 보안 정책 사용"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"설정"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"일반 설정"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"삭제하기 전에 확인"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"보내기 전에 확인"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"이메일 검색"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"기기 카메라 사용 허용 안함"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"기기 비밀번호 필요"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"최근 사용한 비밀번호 재사용 제한"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"좋습니다."</string>
     <string name="quick_3" msgid="8070999183033184986">"나중에 읽어보고 연락 드리겠습니다."</string>
     <string name="quick_4" msgid="216066940197616025">"회의에서 얘기해 봅시다."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"계정 백그라운드 동기화가 로밍하는 동안 사용 중지됩니다."</string>
     <string name="confirm_response" msgid="6764021931370809514">"응답을 보내는 중..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"개인용(IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"개인용(POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"메시지가 없습니다."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"폴더 선택기"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"서버의 <xliff:g id="ACCOUNT">%s</xliff:g>용 휴지통 폴더 선택"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"서버의 <xliff:g id="ACCOUNT">%s</xliff:g>용 전송 항목 폴더 선택"</string>
     <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>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
deleted file mode 100644
index dbe54a6..0000000
--- a/res/values-ky-rKG/strings.xml
+++ /dev/null
@@ -1,377 +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">"Электрондук билдирүүнүн тиркемелерин окуу"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"Колдонмого электрондук билдирүүнүн тиркемелерин окуу мүмкүнчүлүгүн берет."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"Электрондук почтанын жабдуучусунун дайындарына кирүү"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"Колдонмого алынган билдирүүлөр, жөнөтүлгөн билдирүүлөр, колдонуучу аттары жана сырсөздөр сыяктуу электрондук почтаңыздын дайындар базасына кирүү мүмкүнчүлүгүн берет."</string>
-    <!-- no translation found for app_name (2206468539066258195) -->
-    <skip />
-    <!-- no translation found for debug_title (1337476992195531309) -->
-    <skip />
-    <!-- no translation found for create_action (6575946089819721958) -->
-    <skip />
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"Тез жооп жок."</string>
-    <!-- no translation found for account_settings_action (589969653965674604) -->
-    <skip />
-    <string name="status_network_error" msgid="526826323872477973">"Туташуу көйгөйү."</string>
-    <!-- no translation found for move_messages:one (3431489066510898753) -->
-    <!-- no translation found for move_messages:other (5083310421670206821) -->
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 каттоо эсептеринде жылдырууга болбойт."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Тандалган нерседе бир нече каттоо эсеби камтылгандыктан, жылдыруу мүмкүн эмес."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Сомолордогу, Чыгуучу кутусундагы жана Жөнөтүлгөндөрдөгү билдирүүлөрдү жылдыруу мүмкүн эмес."</string>
-    <!-- no translation found for mailbox_name_display_inbox (5093068725739672126) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (8735725798805339414) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (3552043116466269581) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (7020792045007681852) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (6705058612006729985) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (1634126984313831675) -->
-    <skip />
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Жылдызчаланган"</string>
-    <!-- no translation found for mailbox_name_display_unread (1453575937919310339) -->
-    <skip />
-    <!-- no translation found for account_folder_list_summary_inbox (6524816019350737506) -->
-    <skip />
-    <!-- no translation found for account_folder_list_summary_starred (1625089431195748236) -->
-    <skip />
-    <!-- no translation found for account_folder_list_summary_drafts (4050225674547841762) -->
-    <skip />
-    <!-- no translation found for account_folder_list_summary_outbox (5594504984407654721) -->
-    <skip />
-    <!-- no translation found for mailbox_list_account_selector_combined_view (4155918930481733669) -->
-    <skip />
-    <!-- no translation found for message_compose_fwd_header_fmt (6193988236722150221) -->
-    <skip />
-    <!-- no translation found for message_compose_insert_quick_response_list_title (5836926808818821309) -->
-    <skip />
-    <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Тез жоопту кыстаруу"</string>
-    <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Багытталган билдирүүңүздөгү бир же бир нече тиркеме жөнөтүлүүдөн мурун жүктөлүп алынат."</string>
-    <string name="attachment_not_found" msgid="5219773045406833000">"Тиркеме жүктөлүп алынган жок."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"Билдирүү дешифрленип жатканда ката кеткен."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Бир же бир нече тиркеме багытталган жок."</string>
-    <!-- no translation found for forward_download_failed_title (2043036709913723298) -->
-    <skip />
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> кирүү аракети ийгиликсиз аяктады."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"Кирген жок."</string>
-    <!-- no translation found for message_view_attachment_bytes:one (884086921379532485) -->
-    <!-- no translation found for message_view_attachment_bytes:other (1883360269853654045) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (7735927556589634941) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (7476806336055136146) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7755624135347953938) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (3317120193748830799) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (5180812866869430241) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1607574223219436099) -->
-    <!-- no translation found for account_setup_basics_title (5050895656741229172) -->
-    <skip />
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"Уруксат суроодо"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"Кирүү"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"Аныктыгын текшерүү мүмкүн болбой жатат"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"Электрондук почта дареги же сырсөз туура эмес"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"Электрондук почта дареги:"</string>
-    <!-- no translation found for account_setup_basics_headline (8468280216822264643) -->
-    <skip />
-    <string name="accounts_welcome" msgid="7230367425520242593">"Болгону бир нече кадам жасап, каттоо эсебиңизди түзө аласыз."</string>
-    <!-- no translation found for account_setup_basics_email_label (8701406783555749929) -->
-    <skip />
-    <string name="or_label" msgid="6408695162723653446">"ЖЕ"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google менен кирүү"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"СЫРСӨЗ"</string>
-    <string name="password_hint" msgid="4226682910292828279">"Сырсөз"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s менен кирди"</string>
-    <string name="authentication_label" msgid="914463525214987772">"АНЫКТЫГЫН ТЕКШЕРҮҮ"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"Аныктыгын текшерүүнү кошуу"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"Аныктыгын текшерүүнү тазалоо"</string>
-    <!-- no translation found for account_setup_basics_manual_setup_action (7690861839383362085) -->
-    <skip />
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Жарактуу электрондук почта дарегин жана сырсөздү териңиз."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Кош каттоо эсеби"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Бул колдонуучунун аты мурунтан эле \"<xliff:g id="DUPLICATE">%s</xliff:g>\" каттоо эсеби  үчүн колдонулууда."</string>
-    <!-- no translation found for account_password_spaces_error (1035535222734047745) -->
-    <skip />
-    <!-- no translation found for account_setup_check_settings_retr_info_msg (9103280616618316032) -->
-    <skip />
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Сервер жөндөөлөрү текшерилүүдө…"</string>
-    <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>
-    <!-- no translation found for account_setup_names_title (8780121351085082269) -->
-    <skip />
-    <string name="account_setup_names_headline" msgid="2031978210683887370">"Каттоо эсебиңиз түзүлдү, эми электрондук почтаңызга кол сунсаңыз эле жетесиз!"</string>
-    <!-- no translation found for account_setup_names_account_name_label (3487538709712378441) -->
-    <skip />
-    <!-- no translation found for account_setup_names_user_name_label (4298006111315033499) -->
-    <skip />
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Бул талаа бош болбошу керек."</string>
-    <!-- no translation found for account_setup_account_type_title (7081511430549429621) -->
-    <skip />
-    <!-- no translation found for account_setup_account_type_headline (3375795537675351389) -->
-    <skip />
-    <!-- no translation found for account_setup_account_type_instructions (968088954656738617) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_title (7743750350830383718) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_headline (6232828824446177639) -->
-    <skip />
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"КОЛДОНУУЧУНУН ЫСЫМЫ"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"СЫРСӨЗ"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"Сырсөз"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"СЕРВЕР"</string>
-    <string name="account_setup_incoming_port_label" msgid="402562424498833560">"ПОРТ"</string>
-    <string name="account_setup_incoming_security_label" msgid="8360505617331971663">"КООПСУЗДУК ТҮРҮ"</string>
-    <!-- no translation found for account_setup_incoming_security_none_label (2461510827337484818) -->
-    <skip />
-    <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">"SSL/TLS (бардык тастыктамаларды кабыл алуу)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="3892291833944170882">"STARTTLS"</string>
-    <!-- no translation found for account_setup_incoming_delete_policy_label (2341742235654301690) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_delete_policy_never_label (5777530843489961009) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_delete_policy_delete_label (8677018382715596606) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_imap_path_prefix_label (3531290378620033218) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_imap_path_prefix_hint (206747922689229932) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_title (2808821899038184783) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_headline (6638171491109658047) -->
-    <skip />
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP СЕРВЕРИ"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ПОРТ"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"КООПСУЗДУК ТҮРҮ"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Кирүү талап кылынат"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"КОЛДОНУУЧУНУН ЫСЫМЫ"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"СЫРСӨЗ"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"КАРДАРДЫН ТАСТЫКТАМАСЫ"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Тандоо"</string>
-    <!-- no translation found for account_setup_exchange_use_certificate (6513687497912094538) -->
-    <skip />
-    <!-- no translation found for account_setup_exchange_remove_certificate (1222387802827919583) -->
-    <skip />
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Эч нерсе жок"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"МОБИЛДИК ТҮЗМӨКТҮН ID"</string>
-    <!-- no translation found for account_setup_options_title (3274463434235489134) -->
-    <skip />
-    <!-- no translation found for account_setup_options_headline (4810292194395251968) -->
-    <skip />
-    <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Шайкештештирүү жыштыгы:"</string>
-    <!-- no translation found for account_setup_options_mail_check_frequency_never (2937664246354067829) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_push (5511415696925307797) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_5min (8929785860545198867) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_10min (8787901333816702849) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_15min (7127640170766018765) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_30min (4223562871143897449) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_1hour (107706566853925273) -->
-    <skip />
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"Электрондук билдирүү келгенде мага эскертип кой"</string>
-    <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>
-    <!-- no translation found for account_setup_options_background_attachments_label (4085327585082867216) -->
-    <skip />
-    <string name="account_setup_failed_dlg_title" msgid="7923577224474005464">"Аягына чыгарылган жок"</string>
-    <string name="account_setup_options_mail_window_label" msgid="4737241149297585368">"Электрондук почталарды төмөнкүдөн шайкештештирүү:"</string>
-    <!-- no translation found for account_setup_options_mail_window_auto (7407981634952005775) -->
-    <skip />
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"Акыркы күн"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"Акыркы үч күн"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"Өткөн апта"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"Акыркы эки апта"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="3228265299330513816">"Өткөн ай"</string>
-    <!-- no translation found for account_setup_options_mail_window_all (4794683936065721438) -->
-    <skip />
-    <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_fmt" msgid="8811464534757505457">"Кирген жоксуз.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"Серверге коопсуз шартта туташуу мүмкүн болбой жатат.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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>
-    <!-- no translation found for account_setup_failed_tls_required (1902309158359287958) -->
-    <skip />
-    <string name="account_setup_failed_auth_required" msgid="2684010997018901707">"Серверде аныктыкты текшерүү ыкмалары колдоого алынбайт."</string>
-    <string name="account_setup_failed_security" msgid="1627240499907011040">"Коопсуздук катасынан улам серверге туташылган жок."</string>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"Серверге туташылган жок."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"Сервердин дарегин туура эмес тердиңиз же сервер электрондук почтада колдоого алынбай турган протоколдун версиясын талап кылууда."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"Бул сервер менен шайкештештирүүгө уруксат жок. Толугураак маалымат алуу үчүн, сервериңиздин администраторуна кайрылыңыз."</string>
-    <!-- no translation found for account_setup_security_required_title (667943309546419435) -->
-    <skip />
-    <!-- no translation found for account_setup_security_policies_required_fmt (9029471168291631932) -->
-    <skip />
-    <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Бул сервер Android түзмөгүңүздө колдоого алынбай турган төмөнкүдөй коопсуздук каражаттарын талап кылууда: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Каттоо эсебинин колдонуучу атын өзгөртө албайсыз. Колдонуучу аты башкача болгон каттоо эсебин кошуу үчүн, Каттоо эсебин кошуу көрүнүшүнө тийип коюңуз."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"ЭСКЕРТҮҮ: Түзмөгүңүздү башкаруу максатында Электрондук почта колдонмосунун ыйгарым укуктарын өчүргөнүңүздө, электрондук почтанын бардык каттоо эсептери, ошону менен катар алардын электрондук почтасы, байланыштары, жылнаамадагы окуялар жана башка дайындар жок болот."</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_change_title" msgid="615639963487448183">"Коопсуздук саясаттары өзгөрүлдү"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"Коопсуздук саясаты сакталбайт"</string>
-    <string name="account_security_title" msgid="6072273231606918870">"Түзмөктүн коопсуздугу"</string>
-    <!-- no translation found for account_security_policy_explanation_fmt (2527501853520160827) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_edit_details_action (8155332642922842729) -->
-    <skip />
-    <string name="password_expire_warning_ticker_fmt" msgid="5543005790538884060">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" кулпу экраныңыздын PIN кодун же сырсөздү өзгөртүүнү талап кылууда."</string>
-    <!-- no translation found for password_expire_warning_content_title (4360288708739366810) -->
-    <skip />
-    <!-- no translation found for password_expired_ticker (3098703963402347483) -->
-    <skip />
-    <!-- no translation found for password_expired_content_title (7379094218699681984) -->
-    <skip />
-    <!-- no translation found for password_expire_warning_dialog_title (4901499545146045672) -->
-    <skip />
-    <string name="password_expire_warning_dialog_content_fmt" msgid="1093389293050776319">"Тез арада кулпу экранынын PIN кодун же сырсөзүн өзгөртүшүңүз керек, болбосо <xliff:g id="ACCOUNT">%s</xliff:g> дайындары тазаланат. Аны азыр өзгөртөсүзбү?"</string>
-    <!-- no translation found for password_expired_dialog_title (7275534155170185252) -->
-    <skip />
-    <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Түзмөгүңүздөн <xliff:g id="ACCOUNT">%s</xliff:g> дайындары тазаланып жатат. Аны кулпу экраныңыздын PIN кодун же сырсөзүн өзгөртүп калыбына келтире аласыз. Азыр өзгөртөсүзбү?"</string>
-    <!-- no translation found for account_settings_exit_server_settings (4232590695889111419) -->
-    <skip />
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Кирген жок."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> колдонуучунун аты же сырсөз туура эмес. Аларды азыр жаңыртасызбы?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"<xliff:g id="ACCOUNT">%s</xliff:g> кире алган жоксуз; сервердин айтымында: <xliff:g id="REASON">%s</xliff:g> Колдонуучу атыңызды жана/же сырсөзүңүздү жаңыртасызбы?"</string>
-    <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Тиркемелерди жүктөп алуу"</string>
-    <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Тиркемелерди акырк. билдир-гө Wi-Fi менен автоматтык жүктөп алуу"</string>
-    <!-- no translation found for account_settings_notify_label (8621226576645167987) -->
-    <skip />
-    <!-- no translation found for account_settings_summary (4733776978291376161) -->
-    <skip />
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"Электрондук билдирүү алынганда эскертме жөнөтүү"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"Шайкештештирүү жыштыгы"</string>
-    <!-- no translation found for account_settings_incoming_label (3793314460723296874) -->
-    <skip />
-    <!-- no translation found for account_settings_incoming_summary (7521181981008371492) -->
-    <skip />
-    <!-- no translation found for account_settings_outgoing_label (4997504719643828381) -->
-    <skip />
-    <!-- no translation found for account_settings_outgoing_summary (1884202151340479161) -->
-    <skip />
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"Күчүнө кирген саясаттар"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"Эч нерсе жок"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"Колдоого алынбаган саясаттар"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"Эч нерсе жок"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"Шайкештештирүү аракети"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"Бул каттоо эсебин шайкештештирүү үчүн бул жерге тийип коюңуз"</string>
-    <!-- no translation found for account_settings_description_label (2073736045984411004) -->
-    <skip />
-    <!-- no translation found for account_settings_name_label (8230436030850457988) -->
-    <skip />
-    <!-- no translation found for account_settings_edit_quick_responses_label (6105791335935883199) -->
-    <skip />
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"Электрондук билдирүү жазылганда көп кыстарылган текстти түзөтүү"</string>
-    <!-- no translation found for account_settings_notifications (2842952349214972116) -->
-    <skip />
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"Дайындарды колдонуу"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"Коопсуздук саясаттары"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"Тутум папкалары"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"Таштандылар папкасы"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"Сервериңиздеги таштандылар папкасын тандаңыз"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"Сервериңиздеги таштандылар папкасын тандаңыз"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"Жөнөтүлгөн нерселер папкасы"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"Сервериңиздеги жөнөтүлгөн нерселер папкасын тандаңыз"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"Сервериңиздеги жөнөтүлгөн нерселер папкасын тандаңыз"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"Тез жооп"</string>
-    <!-- no translation found for save_action (5740359453077441466) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_enable (2642448079273767521) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (1716022682035150630) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_calendar_enable (3172491863244160828) -->
-    <skip />
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Жылнаама окуясын бул каттоо эсебине шайкештештир."</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Э-почтаны шайкештеш."</string>
-    <!-- no translation found for account_settings_sync_email_summary (71710510041953351) -->
-    <skip />
-    <!-- no translation found for account_settings_vibrate_when_label (361069844540266098) -->
-    <skip />
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"Шыңгыр тандоо"</string>
-    <!-- no translation found for account_settings_servers (3386185135392642067) -->
-    <skip />
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Шайкештештирүү параметрлери"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"Шайкештештирүү параметрлери (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Бул папканы шайкештештирүү"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Туташканда билдирүүлөр жүктөп алышат"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Почтаны шайкештештирүү күндөрү"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Жөнөтүүчүнүн сүрөтү"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"Бул программага туташуу мүмкүнчүлүгүн берген POP уруксаты айрым гана \"Plus\" каттоо эсептеринде бар. Эгер туура электрондук почта дареги жана сырсөзүңүз менен кире албай жатсаңыз, \"Plus\" каттоо эсебинин акысы төлөнө элек болушу мүмкүн. Ушул электрондук почта каттоо эсептерине кирүү мүмкүнчүлүгүн алуу үчүн желе серепчисин иштетиңиз."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"Бул электрондук почта каттоо эсебин түзүүдөн мурун, T-Online вебсайтына өтүп, POP3 электрондук почтага кирүү мүмкүнчүлүгүн алуу үчүн сырсөз ойлоп табыңыз."</string>
-    <!-- no translation found for exchange_name (3793803477985438102) -->
-    <skip />
-    <!-- no translation found for exchange_name_alternate (293118547772095111) -->
-    <skip />
-    <string name="system_account_create_failed" msgid="2248313263003927725">"Каттоо эсеби түзүлгөн жок. Дагы бир жолу аракет кылып көрүңүз."</string>
-    <!-- no translation found for device_admin_label (3335272972461391415) -->
-    <skip />
-    <!-- no translation found for device_admin_description (4299378570982520839) -->
-    <skip />
-    <string name="settings_activity_title" msgid="4787565736829092053">"Жөндөөлөр"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"Жалпы жөндөөлөр"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Жок кылуудан мурун ырастоо"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Жөнөтүүдөн мурун ырастоо"</string>
-    <!-- no translation found for more_than_999 (4088200269333058889) -->
-    <skip />
-    <!-- no translation found for search_hint (3491349343647799436) -->
-    <skip />
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Түзмөктүн камерасынын колдонулушуна тыюу салуу"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"Түзмөктүн сырсөзүн талап кылуу"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"Мурунку сырсөздөрдүн кайрадан колдонулушун чектөө"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"Мөөнөтү аяктай турган сырсөздөр талап кылынат"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"Иштебеген түзмөктүн экранын кулпулоону талап кылуу"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"Шайкештештирилг. жылнаама окуяларынын санын чектөө"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"Шайкештештрлгн. электрондук почтанын санын чектөө"</string>
-    <string name="quick_1" msgid="9130521670178673190">"Рахмат!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"Жакшы нерсе окшойт!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"Муну бир аздан кийин окуп, анан сени менен байланышам."</string>
-    <string name="quick_4" msgid="216066940197616025">"Жолугуп ушул нерсени талкуулабайлыбы?"</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"Роуминг учурунда бул каттоо эсебинин фондук шайкештештирүүсү иштебейт."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"Жооп жөнөтүлүүдө…"</string>
-    <string name="no_conversations" msgid="3785854971159919343">"Бир дагы билдирүү жок."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"Папка кармагыч"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> серврд таштанды папксн тандңз"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> серврд жөнтлгндр папксн тндоо"</string>
-    <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Папкалар тизмеси жүктөлүүдө…"</string>
-    <string name="no_quick_responses" msgid="8716297053803961304">"Эч нерсе жок"</string>
-    <!-- no translation found for gmail_name (2099786953868369991) -->
-    <skip />
-    <!-- no translation found for folder_sync_settings_pref_title (349478353401667107) -->
-    <skip />
-</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 50f5b46..3cd3423 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"ເຂົ້າ​ເຖິງ​ຂໍ້ມູນ​ຜູ່​ໃຫ້​ບໍລິການ​ອີເມວ"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"ອະນຸຍາດ​ໃຫ້​ແອັບຯ​ດັ່ງກ່າວ​ເຂົ້າ​ເຖິງ​ຖານ​ຂໍ້ມູນ​ອີເມວ, ຮວມ​ເຖິງ​ຂໍ້ຄວາມ​ທີ່​ໄດ້​ຮັບ, ຂໍ້ຄວາມທີ່ສົ່ງແລ້ວ, ຊື່ຜູ່ໃຊ້ ແລະ​ລະຫັດຜ່ານ."</string>
     <string name="app_name" msgid="2206468539066258195">"ອີເມວ"</string>
+    <string name="debug_title" msgid="1337476992195531309">"ດີບັ໊ກ"</string>
     <string name="create_action" msgid="6575946089819721958">"ສ້າງໃຫມ່"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"ບໍ່​ມີ​ການ​ຕອບ​ກັບ​ແບບ​ໄວ."</string>
     <string name="account_settings_action" msgid="589969653965674604">"ການຕັ້ງຄ່າບັນຊີ"</string>
+    <string name="status_network_error" msgid="526826323872477973">"ເກີດບັນຫາການເຊື່ອມຕໍ່."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"ຍ້າຍຂໍ້ຄວາມ"</item>
+    <item quantity="other" msgid="5083310421670206821">"ຍ້າຍຂໍ້ຄວາມ"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"ບໍ່​ຮອງຮັບ​ການ​ຍ້າຍ​ໃນບັນຊີແບບ POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"ບໍ່​ສາມາດ​ຍ້າຍ​ໄດ້. ລາຍການ​ທີ່​ໄດ້​ເລືອກ​ແມ່ນ​ມາ​ຈາກ​ຫຼາຍ​ບັນ​ຊີ."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"ຂໍ້ຄວາມ​ໃນສະ​ບັບ​ຮ່າງ, ອີ​ເມວ​ຂາ​ອອກ ແລະ​ອີເມວທີ່ສົ່ງແລ້ວ​ ແມ່ນ​ບໍ່ສາມາດ​ຍ້າຍໄດ້."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"ອິນບັອກ"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"ອີ​ເມວ​ຂາ​ອອກ"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"ສະບັບຮ່າງ"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"ຂີ້ເຫຍື້ອ"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"ຕິດດາວແລ້ວ"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"ຍັງບໍ່ໄດ້ອ່ານ"</string>
-    <string name="debug_title" msgid="1337476992195531309">"ດີບັ໊ກ"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"ອິນບັອກ"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"ຕິດດາວແລ້ວ"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"ສະບັບຮ່າງ"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"ກ່ອງຈົດໝາຍອອກ"</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>\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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"ບໍ່ສາມາດ​ດາວໂຫລດ​ໄຟລ໌ແນບໄດ້."</string>
     <string name="message_decode_error" msgid="91396461771444300">"ມີຂໍ້ຜິດພາດໃນ​ລະຫວ່າງ​ຖອດລະຫັດ​ຂໍ້ຄວາມດັ່ງກ່າວ."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"ບໍ່ສາມາດ​ສົ່ງຕໍ່​ນຶ່ງ ຫຼື​ຫຼາຍກວ່າ​ນຶ່ງໄຟລ໌ແນບ."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"ໄຟລ໌ແນບ​ບໍ່​ສາມາດສົ່ງຕໍ່ໄດ້"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ເຂົ້າສູ່ລະບົບບໍ່ສຳເລັດ."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"ບໍ່ສາມາດເຂົ້າສູ່ລະບົບໄດ້"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"ຕັ້ງຄ່າບັນຊີ"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"ກຳ​ລັງຮ້ອງຂໍການອະນຸຍາດ"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"​ເຂົ້າ​ສູ່​ລະ​ບົບ"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"ພິມທີ່ຢູ່ອີເມວ ແລະລະຫັດຜ່ານທີ່ຖືກຕ້ອງ."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"ບັນຊີຊ້ຳກັນ"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"ທ່ານໄດ້ໃຊ້ຊື່ຜູ່ໃຊ້ນີ້ສຳລັບບັນຊີ \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ຢູ່ແລ້ວ."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"ລະ​ຫັດ​ຜ່ານ​ນີ້​ເລີ່ມ​ຕ​ົ້ນ ຫຼື​​ລົງ​ທ້າຍ​ດ້ວຍ​ຍະ​ຫວ່າງ​ນຶ່ງ ຫຼືຫຼາຍກວ່າ​ນັ້ນ. ເຊີບ​ເວີ​ສ່ວນ​ໃຫຍ່ບໍ່​ຮອງ​ຮັບ​ລະ​ຫັດ​ຜ່ານ​ທີ່​ມີ​ຍະ​ຫວ່າງຢູ່​ນຳ."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"ກຳລັງຮັບຂໍ້ມູນບັນຊີ..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"ກຳ​ລັງ​ຢືນ​ຢັນ​ການ​ຕັ້ງ​ຄ່າ​ຂອງ​ເຊີບ​ເວີ..."</string>
     <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_names_title" msgid="8780121351085082269">"ຕັ້ງຄ່າບັນຊີ"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"ຊ່ອງນີ້ບໍ່ສາມາດ​ປ່ອຍໃຫ້ຫວ່າງໄດ້."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"ຕັ້ງຄ່າບັນຊີ"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"ປະເພດບັນຊີ"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"ປະ​ເພດ​ບັນ​ຊີ​ຂອງ​ທ່ານ​ນີ້​ແມ່ນ​ປະ​ເພດ​ໃດ?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"ຕັ້ງຄ່າບັນຊີ"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"ການຕັ້ງຄ່າທີ່​ກຳລັງ​ສົ່ງມາຈາກເຊີບເວີ"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ຊື່​ຜູ່​ໃຊ້"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ລະຫັດ​ຜ່ານ"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"ໃນເວລາຂ້ອຍລຶບ​ອອກຈາກ​ກ່ອງຮັບອີເມວ"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"path ນຳໜ້າ IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"ບໍ່ເລືອກກໍໄດ້"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"ຕັ້ງຄ່າບັນຊີ"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"ການຕັ້ງຄ່າ​ທີ່ກຳລັງ​ສົ່ງອອກ​ຈາກເຊີບເວີ"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"ເຊີບເວີ SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ພອດ"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ປະເພດ​ຄວາມປອດໄພ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"ຕ້ອງເຂົ້າສູ່ລະບົບ"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ຊື່​ຜູ່​ໃຊ້"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ລະຫັດ​ຜ່ານ"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"ໃບ​ຮັບຮອງ​ລູກຂ່າຍ"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"ເລືອກ"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"ນໍາໃຊ້ໃບຮັບຮອງຂອງໄຄຼເອນ"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"ລຶບອອກ"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"ບໍ່​ມີ"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ໄອດີ​ອຸປະກອນ​ມືຖື"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"ການຕັ້ງຄ່າບັນຊີ"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"ການເຂົ້າສູ່ລະບົບລົ້ມເຫຼວ.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"ການ​ຈັດການ​ດ້ານຄວາມປອດໄພ​ຈາກ​ໄລຍະໄກ"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"​ທ່ານບໍ່​ສາ​ມາດ​ປ່ຽນ​ຊື່​ຜູ່​ໃຊ້​ຂອງ​ບັນ​ຊີ​ໄດ້. ເພື່ອ​ເພີ່ມ​ບັນ​ຊີ​ທີ່​ມີ​ຊື່​ຜູ່​ໃຊ້​ອື່ນ, ໃຫ້​ແຕະ​ທີ່​ຫົວ​ຂໍ້​ເພີ່ມ​ບັນ​ຊີ."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ຄໍາເຕືອນ: ການປິດ​ອຳ​ນາດໃນການຈັດການ​ຂອງແອັບຯ​ອີເມວ​ໃນອຸປະກອນ​ຂອງທ່ານ ຈະເປັນການ​ລຶບບັນຊີ​ອີເມວ​ພ້ອມກັບ​ອີເມວ​ຂອງບັນຊີທີ່​ກ່ຽວຂ້ອງ, ລາຍຊື່, ນັດໝາຍ​ໃນ​ປະຕິທິນ ແລະ​ຂໍ້ມູນອື່ນໆ​ນຳ."</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>
@@ -206,7 +245,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ຊິ້ງ​ຂໍ້​ມູນ​ນັດ​ໝາຍ​ຂອງ​ປະ​ຕິ​ທິນ​ສຳ​ລັບ​ບັນ​ຊີ​ນີ້"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ຊິ້ງຂໍ້ມູນອີເມວ"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ຊິ້ງຂໍ້ມູນອີເມວຈາກບັນຊີນີ້"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"ສັ່ນເຕືອນ"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"ສັ່ນເຕືອນ"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"ເລືອກສຽງຣິງໂທນ"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"ການຕັ້ງຄ່າເຊີບເວີ"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"ຕົວເລືອກການຊິ້ງຂໍ້ມູນ"</string>
@@ -215,10 +254,17 @@
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"ຂໍ້ຄວາມທັງໝົດ​ຈະຖືກດາວໂຫລດ​ເມື່ອມີການເຊື່ອມຕໍ່​ອິນເຕີເນັດ"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"ຈຳນວນ​ມື້​ຂອງ​ອີເມວ​ທີ່​ຕ້ອງການ​ຊິ້ງ​ຂໍ້ມູນ"</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"ກ່ອນ​ທີ່​ຈະ​ຕິດຕັ້ງ​ບັນ​ຊີ​ອີເມວ, ໃຫ້​ເຂົ້າ​ຊົມເວັບໄຊ T-Online ແລະ ສ້າງ​ລະຫັດ​ຜ່ານ​ສຳລັບ​ການ​ເຂົ້າເຖິງ​ອີເມວ POP3 ກ່ອນ."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"ອົງ​ກອນ"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"ບໍ່ສາມາດສ້າງບັນຊີໄດ້. ລອງໃໝ່ອີກຄັ້ງ."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"ອີເມວ"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"ເປີດນຳໃຊ້ຂໍ້ກຳນົດຄວາມປອດໄພສະເພາະເຊີບເວີ"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"ການຕັ້ງຄ່າ"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"ການຕັ້ງຄ່າທົ່ວໄປ"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"​ຢືນ​ຢັນ​ກ່ອນ​ການ​ລຶບ"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"​ຢືນ​ຢັນ​ກ່ອນ​ການ​ສົ່ງ"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"ຊອກຫາອີເມວ"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"ບໍ່​ອະນຸຍາດ​ໃຫ້​ໃຊ້​ກ້ອງ​ຂອງ​ອຸປະກອນ"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"ຕ້ອງ​ໃຊ້​ລະຫັດຜ່ານ​ຂອງ​ອຸປະກອນ"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"ຈຳກັດການ​ໃຊ້ລະຫັດຜ່ານ​ຫຼ້າສຸດຊ້ຳຄືນ"</string>
@@ -230,13 +276,15 @@
     <string name="quick_2" msgid="8611591278119481491">"ອ່ານ​ແລ້ວ​ຄື​ຊິ​ດີ​ຢູ່!"</string>
     <string name="quick_3" msgid="8070999183033184986">"ຂ້ອຍ​ຈະ​ອ່ານ​ໃນພາຍຫຼັງ​ແລະຈະ​ຕິດຕໍ່​ກັບ​ໄປ."</string>
     <string name="quick_4" msgid="216066940197616025">"ພວກ​ເຮົາ​​ປະ​ຊຸມ​ເພື່ອ​ສົນ​ທະ​ນາ​ເລື່ອງ​ນີ້​ດີກວ່າ."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"ການ​ຊິ້ງ​ຂໍ້ມູນ​ຢູ່​ເບື້ອງ​ຫຼັງ​ສຳລັບ​ບັນຊີນີ້​ໄດ້ຖືກ​ປິດນຳໃຊ້​ໃນ​ລະຫວ່າງ​ການໂຣມມິງ."</string>
     <string name="confirm_response" msgid="6764021931370809514">"ກຳລັງສົ່ງຄໍາຕອບ..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"ສ່ວນ​ໂຕ (IMAP​)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"ສ່ວນ​ໂຕ (POP3​)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"ບໍ່ມີຂໍ້ຄວາມ."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"ໂຕເລືອກໂຟນເດີ"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"ເລືອກໂຟນເດີ​ຖັງຂີ້ເຫຍື້ອ​ຂອງເຊີບເວີສຳລັບ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"ເລືອກໂຟນເດີ​ສົ່ງລາຍການ​ຂອງເຊີບເວີ​ສຳລັບ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <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>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4522486..f2acfed 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Pasiekti el. pašto paslaugų teikėjo duomenis"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Leidžiama šiai programai pasiekti el. pašto duomenis, įskaitant gautus, išsiųstus pranešimus, naudotojų vardus ir slaptažodžius."</string>
     <string name="app_name" msgid="2206468539066258195">"El. paštas"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Derinti"</string>
     <string name="create_action" msgid="6575946089819721958">"Sukurti naują"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Nėra greitų atsakymų."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Paskyros nustatymai"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Ryšio problema."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Perkelti pranešimą"</item>
+    <item quantity="other" msgid="5083310421670206821">"Perkelti pranešimus"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Perkėlimas nepalaikomas POP3 paskyrose."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Negalima perkelti, nes pasirinktos kelios paskyros."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Negalima perkelti pranešimų, esančių aplankuose „Juodraščiai“, „Išsiųstieji“ ir „Siunčiamieji“."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Gautų laiškų aplankas"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Išsiųstieji"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Juodraščiai"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Šlamštas"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Pažymėta žvaigždute"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Neperskaityta"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Derinti"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Gautieji"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Pažymėta žvaigždute"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Juodraščiai"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Išsiųstieji"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Bendras rodinys"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Pirminis pranešimas --------\nTema: <xliff:g id="SUBJECT">%1$s</xliff:g>\nNuo: <xliff:g id="SENDER">%2$s</xliff:g>\nKam: <xliff:g id="TO">%3$s</xliff:g>\nCC (kopija): <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Įterpti greitą atsaką"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Įterpti greitą atsaką"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Prieš siunčiant persiųstame pranešime bus atsisiųstas mažiausiai vienas priedas."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Nepavyko atsisiųsti priedo."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Iškoduojant pranešimą įvyko klaida."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Nepavyko persiųsti mažiausiai vieno priedo."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Priedas nepersiųstas"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Nepavyko prisijungti prie <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Nepavyko prisijungti"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Paskyros sąranka"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Pateikiama prieigos teisės užklausa"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Prisijungimas"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Įveskite galiojantį el. pašto adresą ir slaptažodį."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Kopijuoti paskyrą"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Jau naudojate šį naudotojo vardą „<xliff:g id="DUPLICATE">%s</xliff:g>“ paskyroje."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Šis slaptažodis prasideda ar baigiasi mažiausiai vienu tarpo simboliu. Dauguma serverių nepalaiko slaptažodžių su tarpais."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Nuskaitoma paskyros informacija..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Tikrinami serverio nustatymai…"</string>
     <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_names_title" msgid="8780121351085082269">"Paskyros sąranka"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Šis laukas negali būti tuščias."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Paskyros sąranka"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Paskyros tipas"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Kokio tipo tai paskyra?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Paskyros sąranka"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Gaunamų laiškų serverio nustatymai"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NAUDOTOJO VARDAS"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"SLAPTAŽODIS"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Kai ištrinu iš gautų laiškų aplanko"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP prieigos kelio kodas"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Pasirenkama"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Paskyros sąranka"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Siunčiamų laiškų serverio nustatymai"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP SERVERIS"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PRIEVADAS"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"SAUGOS TIPAS"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Reikalauti prisijungti"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NAUDOTOJO VARDAS"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"SLAPTAŽODIS"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"KLIENTO SERTIFIKATAS"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Pasirinkti"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Naudoti kliento sertifikatą"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Pašalinti"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Nėra"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBILIOJO ĮRENGINIO ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Paskyros nustatymai"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Paskyros parinktys"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Sinchronizavimo dažnis:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Niekada"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Visas"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Naudotojo paskyros numatytieji nustatymai"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Neteisingas naudotojo vardas ar slaptažodis."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Bandant prisijungti įvyko klaida.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Su paskyros sąranka susijusi problema"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Patikrinkite, ar tinkamas naudotojo vardas, slaptažodis ir paskyros nustatymai."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Nepavyksta saugiai prisijungti prie serverio."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Nuotolinis saugos administravimas"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Serveris „<xliff:g id="SERVER">%s</xliff:g>“ reikalauja leisti jam nuotoliniu būdu valdyti kai kurias „Android“ įrenginio saugos funkcijas. Ar norite užbaigti šios paskyros nustatymą?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Šiam serveriui reikalingos saugos funkcijos, kurios nepalaikomos jūsų „Android“ įrenginyje, įskaitant: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Negalima pakeisti paskyros naudotojo vardo. Jei norite pridėti paskyrą su kitu naudotojo vardu, palieskite „Pridėti paskyrą“."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ĮSPĖJIMAS: išaktyvinus el. pašto programos leidimą administruoti įrenginį, bus ištrintos visos el. pašto paskyros, kurioms jis reikalingas, įskaitant el. laiškus, kontaktus, kalendoriaus įvykius ir kitus duomenis."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Saugos naujinys"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"„<xliff:g id="ACCOUNT">%s</xliff:g>“ reikia atnaujinti saugos nustatymus."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Baig. ekr. užr. slapt. galioj. laikas"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Iš įrenginio ištrinami „<xliff:g id="ACCOUNT">%s</xliff:g>“ duomenys. Galite juos atkurti pakeisdami ekrano užrakinimo PIN kodą ar slaptažodį. Ar norite pakeisti jį dabar?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Atmesti neišsaugotus pakeitimus?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Nepavyko prisijungti"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Neteisingas „<xliff:g id="ACCOUNT">%s</xliff:g>“ naudotojo vardas ar slaptažodis. Ar norite atnaujinti juos dabar?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Nepavyko prisijungti prie <xliff:g id="ACCOUNT">%s</xliff:g>. Serveris nurodė: <xliff:g id="REASON">%s</xliff:g> Ar norite atnaujinti naudotojo vardą ir (arba) slaptažodį?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Atsisiųsti priedus"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Automatiškai atsis. naujausių pranešimų priedai per „Wi-Fi“"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"El. pašto pranešimai"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinchronizuoti šios paskyros kalendorių"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sinchron. el. paštą"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sinchron. šios paskyros el. paštą"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibruoti"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibruoti"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Pasirinkti skambėjimo toną"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Serverio nustatymai"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sinchronizavimo parinktys"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sinchronizuoti šį aplanką"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Prisijungus pranešimai bus atsisiųsti"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Dienų, per kurias gauti laiškai sinchronizuojami, skaičius"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Siuntėjo vaizdas"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Tik kai kuriose „Plus“ paskyrose yra POP prieiga, leidžianti prisijungti šiai programai. Jei negalite prisijungti naudodami tinkamą el. pašto adresą ir slaptažodį, galbūt neapmokėjote „Plus“ paskyros. Paleiskite žiniatinklio naršyklę, kad gautumėte prieigą prie šių el. pašto paskyrų."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Prieš nustatydami šią el. pašto paskyrą apsilankykite „T-Online“ svetainėje ir sukurkite POP3 el. pašto prieigos slaptažodį."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Įmonės"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Nepavyko sukurti paskyros. Bandykite dar kartą."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"El. paštas"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Įgalina serverio apibrėžtą saugos politiką"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Nustatymai"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Bendrieji nustatymai"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Patvirtinti prieš ištrinant"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Patvirtinti prieš siunčiant"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Paieška el. pašte"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Neleisti naudoti įrenginio fotoaparato"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Reikalauti įrenginio slaptažodžio"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Riboti naujausių slapt. pakart. panaud."</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Gerai"</string>
     <string name="quick_3" msgid="8070999183033184986">"Perskaitysiu vėliau ir jums atsakysiu."</string>
     <string name="quick_4" msgid="216066940197616025">"Aptarkime tai susitikę."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Foninis šios paskyros sinchronizavimas neleidžiamas perduodant duomenis tarptinkliniu ryšiu."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Siunčiamas atsakymas…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Asmeninė (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Asmeninė (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Pranešimų nėra."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP prieiga"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Aplanko rinkiklis"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Pas. <xliff:g id="ACCOUNT">%s</xliff:g> server. šiukšliad. apl."</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Pas. <xliff:g id="ACCOUNT">%s</xliff:g> ser. išsiųstų elem. apl."</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Įkeliamas aplankų sąrašas…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Pasiekiamų nėra"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Aplanko sinchronizavimo nustatymai"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b118d82..c6a41e7 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Piekļūt e-pasta pakalpojumu sniedzēja datiem"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Ļauj lietotnei piekļūt jūsu e-pasta datu bāzei, tostarp saņemtajiem ziņojumiem, nosūtītajiem ziņojumiem, lietotājvārdiem un parolēm."</string>
     <string name="app_name" msgid="2206468539066258195">"E-pasts"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Atkļūdot"</string>
     <string name="create_action" msgid="6575946089819721958">"Izveidot jaunu"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Nav ātro atbilžu."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Konta iestatījumi"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Savienojuma problēma."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Pārvietot ziņojumu"</item>
+    <item quantity="other" msgid="5083310421670206821">"Pārvietot ziņojumus"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 kontos netiek atbalstīta pārvietošana."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Nevar pārvietot, jo ir atlasīti ziņojumi no vairākiem kontiem."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Ziņojumus, kas atrodas mapēs Melnraksti, Izsūtne un Nosūtītie, nevar pārvietot."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Iesūtne"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Izsūtne"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Melnraksti"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Nevēlamie"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Atzīmēts ar zvaigznīti"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Nelasīti"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Atkļūdot"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Iesūtne"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Atzīmēti ar zvaigznīti"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Melnraksti"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Izsūtne"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Kombinētais skatījums"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Sākotnējais ziņojums --------\nTemats: <xliff:g id="SUBJECT">%1$s</xliff:g>\nNo: <xliff:g id="SENDER">%2$s</xliff:g>\nKam: <xliff:g id="TO">%3$s</xliff:g>\nKopija: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Ātrās atbildes ievietošana"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Ievietot ātro atbildi"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Viens vai vairāki pārsūtītā ziņojuma pielikumi pirms sūtīšanas tiks lejupielādēti."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Nevarēja lejupielādēt pielikumu."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Atšifrējot ziņojumu, radās kļūda."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Nevarēja pārsūtīt vienu vai vairākus pielikumus."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Pielikums netika nosūtīts."</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Neizdevās pierakstīties kontā <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Nevarēja pierakstīties"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Konta iestatīšana"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Notiek pilnvarojuma pieprasīšana"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Pierakstīšanās"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Ierakstiet derīgu e-pasta adresi un paroli."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Dublikāta konts"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Jūs jau izmantojat šo lietotājvārdu kontam <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Paroles sākumā vai beigās ir viena vai vairākas atstarpes. Daudzos serveros netiek nodrošināts atbalsts parolēm, kurās iekļautas atstarpes."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Notiek konta informācijas izgūšana..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Notiek servera iestatījumu pārbaude…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Notiek SMTP iestatījumu pārbaude..."</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Notiek konta izveide..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Konta veida apstiprināšana"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Jūsu norādītajā e-pasta adresē <xliff:g id="EMAIL">%1$s</xliff:g> tiek izmantots protokols <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, taču kontam, iespējams, tiek lietots protokols <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Konta iestatīšana"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Jūsu konts ir izveidots, un ir nosūtīts e-pasta ziņojums."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Ievadiet konta nosaukumu (neobligāti)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Jūsu vārds (attēlots izejošajos ziņojumos)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Šis lauks nedrīkst būt tukšs."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Konta iestatīšana"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Konta veids"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Kāds ir šī konta veids?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Konta iestatīšana"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Ienākošā servera iestatījumi"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"LIETOTĀJVĀRDS"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"PAROLE"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Kad es dzēšu no iesūtnes"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP ceļa prefikss"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Neobligāti"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Konta iestatīšana"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Izejošā servera iestatījumi"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP SERVERIS"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORTS"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"DROŠĪBAS VEIDS"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Pieprasīt pierakstīšanos"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"LIETOTĀJVĀRDS"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"PAROLE"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"KLIENTA SERTIFIKĀTS"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Atlasīt"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Izmantot klienta sertifikātu"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Noņemt"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Nav"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBILĀS IERĪCES ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Konta iestatījumi"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Konta iespējas"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Sinhronizēšanas biežums:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nekad"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Visi"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Lietot konta noklusējumu"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Nepareizs lietotājvārds vai parole."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Neizdevās pieteikties.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problēma ar konta iestatīšanu"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Apstipriniet, ka lietotājvārds, parole un konta iestatījumi ir pareizi."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Nevar izveidot drošu savienojumu ar serveri."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Attālināta drošības administrācija"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Serveris <xliff:g id="SERVER">%s</xliff:g> pieprasa, lai jūs tam atļautu attālināti vadīt dažas jūsu Android ierīces drošības funkcijas. Vai vēlaties pabeigt konta iestatīšanu?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Šajā serverī tiek pieprasītas drošības funkcijas, kas netiek atbalstītas jūsu Android ierīcē, tostarp: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Nevar mainīt konta lietotājvārdu. Lai pievienotu kontu ar citu lietotājvārdu, pieskarieties vienumam Pievienot kontu."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"BRĪDINĀJUMS: deaktivizējot lietotnes E-pasts tiesības administrēt jūsu ierīci, tiks dzēsti visi e-pasta konti, kuriem šī funkcionalitāte ir nepieciešama, kā arī šo kontu e-pasta ziņojumi, kontaktpersonas, kalendāra pasākumi un citi dati."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Drošības atjauninājums"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"Kontam <xliff:g id="ACCOUNT">%s</xliff:g> ir jāatjaunina drošības iestatījumi."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Ekrāna bloķēš. paroles termiņa beigas"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Konta <xliff:g id="ACCOUNT">%s</xliff:g> dati tiek dzēsti no šīs ierīces. Tos var atjaunot, nomainot ekrāna bloķēšanas PIN vai paroli. Vai vēlaties to mainīt tūlīt?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Vai atmest nesaglabātās izmaiņas?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Nevarēja pierakstīties"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Konta <xliff:g id="ACCOUNT">%s</xliff:g> lietotājvārds vai parole nav pareiza. Vai vēlaties tos atjaunināt tūlīt?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Pieteikšanās kontā <xliff:g id="ACCOUNT">%s</xliff:g> nebija veiksmīga; serveris norādīja šādu iemeslu: <xliff:g id="REASON">%s</xliff:g> Vai vēlaties atjaunināt lietotājvārdu un/vai paroli?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Lejupielādēt pielikumus"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Automātiski lejupielādēt jaunāko ziņojumu pielikumus Wi-Fi tīklā"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"E-pasta paziņojumi"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinhr. šī konta kalendāra notikumus"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sinhronizēt e-pastu"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sinhronizēt e-pastu šim kontam"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrozvans"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrozvans"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Izvēlēties zvana signālu"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Servera iestatījumi"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sinhronizācijas opcijas"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sinhronizēt šo mapi"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Ziņojumi tiks lejupielādēti, kad būs izveidots savienojums."</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Sinhronizējamo dienu skaits"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Sūtītāja attēls"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Tikai dažiem Plus kontiem ir pieejama POP piekļuve, kas nodrošina šīs programmas savienojuma izveidi. Ja nevarat pierakstīties, izmantojot pareizo e-pasta adresi un paroli, iespējams, jums nav apmaksāta Plus konta. Lai piekļūtu šiem e-pasta kontiem, palaidiet tīmekļa pārlūkprogrammu."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Pirms šī e-pasta konta iestatīšanas apmeklējiet T-Online vietni un izveidojiet paroli, lai piekļūtu e-pastam pa protokolu POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Korporatīvs"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Nevarēja izveidot kontu. Mēģiniet vēlreiz."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-pasts"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Iespējo servera noteiktas drošības politikas"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Iestatījumi"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Vispārīgi iestatījumi"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Apstiprināt pirms dzēšanas"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Apstiprināt pirms sūtīšanas"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Meklējiet e-pastu"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Neatļaut ierīces kameras izmantošanu"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Pieprasīt ierīces paroli"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Ierobežot jaunāko paroļu atkārt. izmant."</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Esmu ar mieru!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Vēlāk izlasīšu šo ziņojumu un atbildēšu."</string>
     <string name="quick_4" msgid="216066940197616025">"Norunāsim tikšanos, lai to pārrunātu."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Viesabonēšanas laikā fona sinhronizācija šajā kontā ir atspējota."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Notiek atbildes sūtīšana..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personīgs (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personīgs (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Nav ziņojumu."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Mapju atlasītājs"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g>: atlasīt servera atkritnes mapi"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g>: atlasīt servera nosūtni"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Notiek mapju saraksta ielāde…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Nav pieejamas"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Mapju sinhronizācijas iestatījumi"</string>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
deleted file mode 100644
index fa93a4b..0000000
--- a/res/values-mk-rMK/strings.xml
+++ /dev/null
@@ -1,298 +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">"Читај прилози во е-пошта"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"Ѝ дозволува на апликацијата да ги чита прилозите во вашата е-пошта."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"Пристапи до податоците на операторот за е-пошта"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"Ѝ дозволува на апликацијата да пристапува до базата податоци на вашата е-пошта, како на пр.: примени пораки, испратени пораки, кориснички имиња и лозинки."</string>
-    <string name="app_name" msgid="2206468539066258195">"E-пошта"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Отстрани грешка"</string>
-    <string name="create_action" msgid="6575946089819721958">"Создај нов"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"Нема брзи одговори."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"Поставки на сметка"</string>
-    <string name="status_network_error" msgid="526826323872477973">"Проблем при поврзување."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"Премести порака"</item>
-    <item quantity="other" msgid="5083310421670206821">"Премести пораки"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Преместувањето не е поддржано за сметки на POP3."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Не може да се премести бидејќи изборот содржи повеќе сметки."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Пораките во „Нацрти“, „Сандаче за појдовна пошта“ и „Испратени“, не може да се преместат."</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Приемно сандаче"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Сандаче за појдовна пошта"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Нацрти"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"Корпа"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"Испратени"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Непотребно"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Со ѕвезда"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Непрочитани"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Приемно сандаче"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Со ѕвезда"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Нацрти"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Сандаче за појдовна пошта"</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_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>
-    <string name="attachment_not_found" msgid="5219773045406833000">"Прилогот не можеше да се преземе."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"Настана грешка при дешифрирање на пораката."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Не можеше да се проследат еден или повеќе прилози."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"Прилогот не е проследен"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"Најавувањето на <xliff:g id="ACCOUNT_NAME">%s</xliff:g> е неуспешно."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"Не можеше да се пријави."</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> КБ"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> КБ"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> МБ"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> МБ"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ГБ"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ГБ"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"Поставување сметка"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"Барање авторизација"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"Пријави се"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"Не можеме да извршиме автентикација"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"Адресата на е-пошта или лозинката се неточни"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"Адреса на е-пошта:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"Сметка на е-пошта"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"Може да ја поставите сметката во само неколку чекори."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"Адреса на е-пошта"</string>
-    <string name="or_label" msgid="6408695162723653446">"ИЛИ"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Најави се со Google"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"ЛОЗИНКА"</string>
-    <string name="password_hint" msgid="4226682910292828279">"Лозинка"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"Пријавен со %s"</string>
-    <string name="authentication_label" msgid="914463525214987772">"АВТЕНТИКАЦИЈА"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"Додај автентикација"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"Исчисти автентикација"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"Рачно поставување"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Внесете важечки адреса на е-пошта и лозинка."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Двојна сметка"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Веќе го користите ова корисничко име за сметката „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"Оваа лозинка започнува или завршува со едно или повеќе празни места. Многу сервери не поддржуваат лозинки со празни места."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Добивање информации за сметка..."</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Се потврдуваат поставките на серверот..."</string>
-    <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_names_title" msgid="8780121351085082269">"Поставување сметка"</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>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Ова поле не може да биде празно."</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Поставување сметка"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Тип сметка"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Каков тип сметка е ова?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Поставување сметка"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Поставки на влезен сервер"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"КОРИСНИЧКО ИМЕ"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ЛОЗИНКА"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"Лозинка"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"СЕРВЕР"</string>
-    <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">"ССЛ/ТЛС (Прифати ги сите сертификати)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="5169133414545009342">"ССЛ/ТЛС"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="2281920902104029077">"СТАРТТЛС (прифати ги сите сертификати)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="3892291833944170882">"СТАРТТЛС"</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_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>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Поставување сметка"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Поставки на излезен сервер"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"СЕРВЕР SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ПОРТА"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ТИП БЕЗБЕДНОСТ"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Барај најавување"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"КОРИСНИЧКО ИМЕ"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ЛОЗИНКА"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"СЕРТИФИКАТ НА КЛИЕНТ"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Избери"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Користи сертификат на клиент"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Отстрани"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Нема"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ИД НА МОБИЛЕН УРЕД"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"Поставки на сметка"</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_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>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"Секои 15 минути"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"Секои 30 минути"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"Секој час"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"Извести ме кога ќе пристигне е-пошта"</string>
-    <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">"Автоматски преземајте прилози кога сте поврзани на 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>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"Последен ден"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"Минатите три дена"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"Минатата седмица"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"Минатите две седмици"</string>
-    <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_fmt" msgid="8811464534757505457">"Најавувањето не успеа.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"Не може безбедно да се поврзете со серверот.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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_tls_required" msgid="1902309158359287958">"Потребен е ТЛС, но серверот не го поддржува."</string>
-    <string name="account_setup_failed_auth_required" msgid="2684010997018901707">"Серверот не поддржува методи на автентикација."</string>
-    <string name="account_setup_failed_security" msgid="1627240499907011040">"Не можеше да се отвори врска со сервер поради грешка на безбедност."</string>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"Не можеше да се отвори врска со сервер."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"Внесовте неточна адреса на сервер или серверот бара верзија на протокол којашто е-поштата не ја поддржува."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"Немате дозвола за синхронизирање со овој сервер. Контактирајте со администраторот на серверот за повеќе информации."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"Применување далечинска безбедност"</string>
-    <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"Не може да го промените корисничкото име на сметката. За да додадете сметка со различно корисничко име, допрете „Додај сметка“."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"ПРЕДУПРЕДУВАЊЕ: Со деактивирање на овластувањето за апликацијата „Е-пошта“ да го администрира вашиот уред ќе се избришат сите сметки на е-пошта на кои им е потребно, заедно со нивните податоци за е-пошта, контакти, календарски настани и друго."</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_change_title" msgid="615639963487448183">"Правилата за безбедност се променија"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"Политиките за безбедност не може да се исполнат"</string>
-    <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_content_title" msgid="4360288708739366810">"Лозинката за заклучување на екранот истекува"</string>
-    <string name="password_expired_ticker" msgid="3098703963402347483">"ПИН-бројот или лозинката за заклучениот екран истече."</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_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_login_dialog_title" msgid="2250911725501042470">"Не можеше да се пријави."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Корисничкото име или лозинката за <xliff:g id="ACCOUNT">%s</xliff:g> се неточни. Дали сакате сега да ги ажурирате?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Вашето најавување на <xliff:g id="ACCOUNT">%s</xliff:g> не успеа. Серверот ја даде следната причина: <xliff:g id="REASON">%s</xliff:g> Дали сакате да го ажурирате вашето корисничко име и/или лозинката?"</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>
-    <string name="account_settings_summary" msgid="4733776978291376161">"Зачестеност на синхронизирање, известувања, итн."</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"Испрати известување кога ќе пристигне е-пошта"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"Зачестеност на синхронизација"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"Поставки за дојдовна пошта"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"Корисничко име, лозинка и други поставки на влезниот сервер."</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"Поставки за појдовна пошта"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"Корисничко име, лозинка и други поставки на влезниот сервер."</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"Наметнати правила"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"Нема"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"Неподдржани правила"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"Нема"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"Обиди се да синхронизираш"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"Допрете тука за да ја синхронизирате сметката"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"Име на сметка"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"Вашето име"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"Брзи одговори"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"Уредувајте текст што често го вметнувате при составување е-пошта"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"Поставки на известувања"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"Користење податоци"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"Безбедносни правила"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"Системски папки"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"Папка за корпа"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"Изберете ја папката за корпа на серверот"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"Изберете ја папката за корпа на серверот"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"Папка за испратени ставки"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"Изберете ја папката за испратени ставки на серверот"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"Изберете ја папката за испратени ставки на серверот"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"Брз одговор"</string>
-    <string name="save_action" msgid="5740359453077441466">"Зачувај"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"Синхронизирај контакти"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"Синхронизирај контакти за оваа сметка"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"Календар на синхронизација"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Синхронизирај календарски настан за оваа сметка"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Синхронизирај е-пошта"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Синхронизирај е-пошта за оваа сметка"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Вибрации"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"Избери мелодија"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"Поставки на сервер"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Опции за синхронизација"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"Опции за синхронизација (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Синхронизирај ја папката"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Пораките ќе се преземат кога ќе има поврзување"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Денови пошта за синхронизација"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Слика на испраќач"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"Само некои сметки „Plus“ опфаќаат пристап на POP што овозможува поврзување на програмата. Ако не може да се пријавите со вашите точни адреса на е-пошта и лозинка, можно е да немате платена сметка „Plus“. Стартувајте го веб-прелистувачот за да добиете пристап до овие сметки на е-пошта."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"Пред да ја поставите сметката на е-пошта, посетете ја веб-локацијата T-Online и создајте лозинка на пристап до е-пошта преку POP3."</string>
-    <string name="exchange_name" msgid="3793803477985438102">"Корпоративна"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"Сметката не можеше да се создаде. Обидете се повторно."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"E-пошта"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"Овозможува политики на безбедност специфични за серверот"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"Поставки"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"Општи поставки"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Потврди пред бришење"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Потврди пред испраќање"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"Пребарај ја е-поштата"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Оневозможи ја употребата на фотоапаратот на уредот"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"Барај лозинка на уред"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"Ограничи повторна употреба на неодамнешни лозинки"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"Барај лозинките да истекуваат"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"Барај неактивен уред да го заклучува својот екран"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"Ограничете го бројот на синхронизирани календарски настани"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"Ограничете го бројот на синхронизирани пораки на е-пошта"</string>
-    <string name="quick_1" msgid="9130521670178673190">"Фала!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"Добро ми звучи!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"Ќе го прочитам ова подоцна и ќе ти одговорам."</string>
-    <string name="quick_4" msgid="216066940197616025">"Ајде да закажеме состанок за да разговараме за ова."</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"Синхронизирањето во заднина за оваа сметка е оневозможено во роаминг."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"Се испраќа одговор…"</string>
-    <string name="no_conversations" msgid="3785854971159919343">"Нема пораки."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"Избирач на папка"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"Изберете папка за корпа на серверот за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"Избери папка на испратени ставки на сервер за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Се вчитува списокот со папки…"</string>
-    <string name="no_quick_responses" msgid="8716297053803961304">"Нема достапни"</string>
-    <!-- no translation found for gmail_name (2099786953868369991) -->
-    <skip />
-    <!-- no translation found for folder_sync_settings_pref_title (349478353401667107) -->
-    <skip />
-</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
deleted file mode 100644
index 8af4982..0000000
--- a/res/values-ml-rIN/strings.xml
+++ /dev/null
@@ -1,296 +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">"ഇമെയിൽ അറ്റാച്ചുമെന്റുകൾ റീഡുചെയ്യുക"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"നിങ്ങളുടെ ഇമെയിൽ അറ്റാച്ചുമെന്റുകൾ റീഡുചെയ്യാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"ഇമെയിൽ ദാതാവിന്റെ ഡാറ്റ ആക്‌സസ്സുചെയ്യുക"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"ലഭിച്ച സന്ദേശങ്ങളും അയച്ച സന്ദേശങ്ങളും ഉപയോക്തൃനാമങ്ങളും പാസ്‌വേഡുകളും ഉൾപ്പെടെ നിങ്ങളുടെ ഇമെയിൽ ഡാറ്റാബേസ് ആക്സസ്സുചെയ്യാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
-    <string name="app_name" msgid="2206468539066258195">"ഇമെയിൽ"</string>
-    <string name="debug_title" msgid="1337476992195531309">"ഡീബഗ്"</string>
-    <string name="create_action" msgid="6575946089819721958">"പുതിയത് സൃഷ്‌ടിക്കുക"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"ദ്രുത പ്രതികരണങ്ങളൊന്നുമില്ല."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"അക്കൗണ്ട് ക്രമീകരണങ്ങൾ"</string>
-    <string name="status_network_error" msgid="526826323872477973">"കണക്ഷൻ പ്രശ്‌നം."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"സന്ദേശം നീക്കുക"</item>
-    <item quantity="other" msgid="5083310421670206821">"സന്ദേശങ്ങൾ നീക്കുക"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 അക്കൗണ്ടുകളിൽ നീക്കുന്നതിനെ പിന്തുണയ്‌ക്കുന്നില്ല."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"തിരഞ്ഞെടുത്തതിൽ ഒന്നിലധികം അക്കൗണ്ടുകൾ ഉള്ളതിനാൽ നീക്കാനാകില്ല."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"ഡ്രാഫ്റ്റുകൾ, ഔട്ട്‌ബോക്‌സ്, അയച്ചവ എന്നിവയിലെ സന്ദേശങ്ങൾ നീക്കാനാകില്ല."</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"ഇന്‍ബോക്‌സ്"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"ഔട്ട്ബോക്സ്"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"ഡ്രാഫ്‌റ്റുകൾ"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"ട്രാഷ്"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"അയച്ചവ"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"ജങ്ക്"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"നക്ഷത്രമിട്ടവ"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"വായിക്കാത്തവ"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"ഇന്‍ബോക്‌സ്"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"നക്ഷത്രമിട്ടവ"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"ഡ്രാഫ്‌റ്റുകൾ"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"ഔട്ട്ബോക്സ്"</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>\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>
-    <string name="attachment_not_found" msgid="5219773045406833000">"അറ്റാച്ചുമെന്റ് ഡൗൺലോഡുചെയ്യാനായില്ല."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"സന്ദേശം ഡീകോഡുചെയ്യുമ്പോൾ ഒരു പിശകുണ്ടായി."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"ഒന്നോ അതിലധികമോ അറ്റാച്ചുമെന്റുകൾ കൈമാറാനായില്ല."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"അറ്റാച്ചുമെന്റ് കൈമാറിയില്ല"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> സൈൻ ഇൻ ചെയ്‌തു."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"സൈൻ ഇൻ ചെയ്യാനായില്ല"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"അക്കൗണ്ട് സജ്ജീകരണം"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"അംഗീകാരം അഭ്യർത്ഥിക്കുന്നു"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"സൈൻ ഇൻ ചെയ്യുക"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"പ്രമാണീകരിക്കാനാകുന്നില്ല"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"ഇമെയിൽ വിലാസമോ പാസ്‌വേഡോ തെറ്റാണ്"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"ഇമെയില്‍ വിലാസം:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"ഇമെയിൽ അക്കൗണ്ട്"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"കുറച്ചുമാത്രം ഘട്ടങ്ങളിലൂടെ നിങ്ങളുടെ അക്കൗണ്ടിനായി ഇമെയിൽ സജ്ജീകരിക്കാനാകും."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"ഇമെയിൽ വിലാസം"</string>
-    <string name="or_label" msgid="6408695162723653446">"അല്ലെങ്കിൽ"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google ഉപയോഗിച്ച് സൈൻ ഇൻ ചെയ്യുക"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"പാസ്‌വേഡ്"</string>
-    <string name="password_hint" msgid="4226682910292828279">"പാസ്‌വേഡ്"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s ഉപയോഗിച്ച് സൈൻ ഇൻ ചെയ്‌തു"</string>
-    <string name="authentication_label" msgid="914463525214987772">"പ്രമാണീകരണം"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"പ്രാമാണീകരണം ചേർക്കുക"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"പ്രാമാണീകരണം മായ്‌ക്കുക"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"സ്വമേധയാലുള്ള സജ്ജീകരണം"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"ഒരു സാധുവായ ഇമെയിൽ വിലാസവും പാസ്‌വേഡും ടൈപ്പുചെയ്യുക."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"തനിപ്പകർപ്പ് അക്കൗണ്ട്"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"\"<xliff:g id="DUPLICATE">%s</xliff:g>\" എന്ന അക്കൗണ്ടിനായി നിങ്ങൾ ഇതിനകം ഈ ഉപയോക്തൃനാമം ഉപയോഗിക്കുന്നു."</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"ഈ പാസ്‌വേഡ് ഒന്നോ അതിലധികമോ സ്‌പെയ്‌സ് പ്രതീകങ്ങൾ ഉപയോഗിച്ച് ആരംഭിക്കുകയോ അവസാനിക്കുകയോ ചെയ്യുന്നു. മിക്ക സെർവറുകളും സ്‌പെയ്‌സുകളുള്ള പാസ്‌വേഡുകളെ പിന്തുണയ്‌ക്കില്ല."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"അക്കൗണ്ട് വിവരം വീണ്ടെടുക്കുന്നു…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"സെർവർ ക്രമീകരണങ്ങൾ മൂല്യനിർണ്ണയം ചെയ്യുന്നു…"</string>
-    <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="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_title" msgid="8780121351085082269">"അക്കൗണ്ട് സജ്ജീകരണം"</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>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"ഈ ഫീൽഡ് ശൂന്യമായിടരുത്."</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"അക്കൗണ്ട് സജ്ജീകരണം"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"അക്കൗണ്ട് തരം"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"ഇത് എന്തുതരം അക്കൗണ്ടാണ്?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"അക്കൗണ്ട് സജ്ജീകരണം"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"ഇൻകമിംഗ് സെർവർ ക്രമീകരണങ്ങൾ"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ഉപയോക്തൃനാമം"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"പാസ്‌വേഡ്"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"പാസ്‌വേഡ്"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"സെർവർ"</string>
-    <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_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>
-    <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_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>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"അക്കൗണ്ട് സജ്ജീകരണം"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"ഔട്ട്‌ഗോയിംഗ് സെർവർ ക്രമീകരണങ്ങൾ"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP സെർവർ"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"പോർട്ട്"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"സുരക്ഷ തരം"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"സൈൻ ഇൻ ആവശ്യമാണ്"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ഉപയോക്തൃനാമം"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"പാസ്‌വേഡ്"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"ക്ലയന്റ് സർട്ടിഫിക്കറ്റ്"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"തിരഞ്ഞെടുക്കുക"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"ക്ലയന്റ് സർട്ടിഫിക്കറ്റ് ഉപയോഗിക്കുക"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"നീക്കംചെയ്യുക"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"ഒന്നുമില്ല"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"മൊബൈൽ ഐഡി"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"അക്കൗണ്ട് ക്രമീകരണങ്ങൾ"</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_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>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"ഓരോ 15 മിനിറ്റിലും"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"ഓരോ 30 മിനിറ്റിലും"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"ഓരോ മണിക്കൂറും"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"ഇമെയിൽ ലഭിക്കുമ്പോൾ എന്നെ അറിയിക്കുക"</string>
-    <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">"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>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"അവസാന ദിവസം"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"കഴിഞ്ഞ മൂന്നുദിവസം"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"കഴിഞ്ഞ ആഴ്‌ച"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"കഴിഞ്ഞ രണ്ട് ആഴ്‌ച"</string>
-    <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_fmt" msgid="8811464534757505457">"ലോഗിൻ പരാജയപ്പെട്ടു.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"സെർവറിലേക്ക് സുരക്ഷിതമായി കണക്റ്റുചെയ്യാനാകില്ല.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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_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>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"സെർവറിലേക്ക് കണക്ഷൻ തുറക്കാനായില്ല."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"നിങ്ങൾ തെറ്റായ സെർവർ വിലാസം ടൈപ്പുചെയ്‌തു, അല്ലെങ്കിൽ സെർവറിന് ഇമെയിൽ പിന്തുണയ്‌ക്കാത്ത ഒരു പ്രോട്ടോക്കോൾ പതിപ്പ് ആവശ്യമാണ്."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"ഈ സെർവറുമായി സമന്വയിപ്പിക്കാൻ നിങ്ങൾക്ക് അനുമതിയില്ല. കൂടുതൽ വിവരങ്ങൾക്ക് നിങ്ങളുടെ സെർവറിന്റെ അഡ്‌മിനിസ്‌ട്രേറ്ററെ ബന്ധപ്പെടുക."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"വിദൂര സുരക്ഷാ അഡ്‌മിനിസ്‌ട്രേഷൻ"</string>
-    <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"നിങ്ങൾക്ക് ഒരു അക്കൗണ്ടിന്റെ ഉപയോക്തൃനാമം മാറ്റാനാകില്ല. മറ്റൊരു ഉപയോക്തൃനാമം ഉപയോഗിച്ച് ഒരു അക്കൗണ്ട് ചേർക്കാൻ, അക്കൗണ്ട് ചേർക്കുക സ്പർശിക്കുക."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"മുന്നറിയിപ്പ്: നിങ്ങളുടെ ഉപകരണത്തെ നിയന്ത്രിക്കാനുള്ള ഇമെയിൽ അപ്ലിക്കേഷന്റെ അധികാരം നിർജ്ജീവമാക്കുന്നത്, അത് ആവശ്യമായ എല്ലാ ഇമെയിൽ അക്കൗണ്ടുകളേയും അവയിലെ ഇമെയിലുകൾ, കോൺടാക്റ്റുകൾ, കലണ്ടർ ഇവന്റുകൾ, മറ്റ് ഡാറ്റ എന്നിവയേയും ഇല്ലാതാക്കും."</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_change_title" msgid="615639963487448183">"സുരക്ഷാ നയങ്ങൾ മാറ്റി"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"സുരക്ഷാ നയങ്ങൾ പാലിക്കാനാകില്ല"</string>
-    <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">"നിങ്ങളുടെ ലോക്ക് സ്‌ക്രീൻ PIN അല്ലെങ്കിൽ പാസ്‌വേഡ് മാറ്റേണ്ടത് \"<xliff:g id="ACCOUNT">%s</xliff:g>\" എന്നതിന് ആവശ്യമാണ്."</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"ലോക്ക് സ്‌ക്രീൻ പാസ്‌വേഡ് കാലഹരണപ്പെടുന്നു"</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">"നിങ്ങളുടെ ലോക്ക് സ്‌ക്രീൻ 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> എന്നതിനായുള്ള ഡാറ്റ മായ്ച്ചുകൊണ്ടിരിക്കുന്നു.. നിങ്ങളുടെ ലോക്ക് സ്‌ക്രീൻ PIN അല്ലെങ്കിൽ പാസ്‌വേഡ് മാറ്റുന്നതിലൂടെ നിങ്ങൾക്ക് അത് പുനഃസ്ഥാപിക്കാനാകും. നിങ്ങൾക്ക് അത് ഇപ്പോൾ മാറ്റണമെന്നുണ്ടോ?"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"സംരക്ഷിക്കാത്ത മാറ്റങ്ങൾ നിരസിക്കണോ?"</string>
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"സൈൻ ഇൻ ചെയ്യാനായില്ല"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> എന്നതിനുള്ള ഉപയോക്തൃനാമമോ പാസ്‌വേഡോ തെറ്റാണ്. അവ ഇപ്പോൾ അപ്‌ഡേറ്റുചെയ്യണോ?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"<xliff:g id="ACCOUNT">%s</xliff:g> എന്നതിലേക്കുള്ള നിങ്ങളുടെ ലോഗിൻ പരാജയപ്പെട്ടു, സെർവർ പറയുന്നു: <xliff:g id="REASON">%s</xliff:g> നിങ്ങളുടെ ഉപയോക്തൃനാമവും കൂടാതെ/അല്ലെങ്കിൽ പാസ്‌വേഡും അപ്‌ഡേറ്റുചെയ്യണമെന്നുണ്ടോ?"</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>
-    <string name="account_settings_summary" msgid="4733776978291376161">"സമന്വയ ആവർത്തനം, അറിയിപ്പ് മുതലായവ"</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"ഇമെയിൽ ലഭിക്കുമ്പോൾ അറിയിപ്പ് അയയ്‌ക്കുക"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"സമന്വയ ആവർത്തനം"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"ഇൻകമിംഗ് ക്രമീകരണങ്ങൾ"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"ഉപയോക്തൃനാമവും പാസ്‌വേഡും മറ്റ് ഇൻകമിംഗ് സെർവർ ക്രമീകരണങ്ങളും"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"ഔട്ട്‌ഗോയിംഗ് ക്രമീകരണങ്ങൾ"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"ഉപയോക്തൃനാമവും പാസ്‌വേഡും മറ്റ് ഔട്ട്ഗോയിംഗ് സെർവർ ക്രമീകരണങ്ങളും"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"നയങ്ങൾ നടപ്പിലാക്കിയിരിക്കുന്നു"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"ഒന്നുമില്ല"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"പിന്തുണയ്‌ക്കാത്ത നയങ്ങൾ"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"ഒന്നുമില്ല"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"സമന്വയിപ്പിക്കാൻ ശ്രമിക്കുക"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"ഈ അക്കൗണ്ട് സമന്വയിപ്പിക്കാൻ ഇവിടെ സ്‌പർശിക്കുക"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"അക്കൗണ്ടിന്റെ പേര്"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"നിങ്ങളുടെ പേര്"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"ദ്രുത പ്രതികരണങ്ങൾ"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"ഇമെയിൽ രചിക്കുമ്പോൾ നിങ്ങൾ പതിവായി ചേർക്കുന്ന ടെക്‌സ്റ്റ് എഡിറ്റുചെയ്യുക"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"അറിയിപ്പ് ക്രമീകരണങ്ങൾ"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"ഡാറ്റ ഉപയോഗം"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"സുരക്ഷാ നയങ്ങൾ"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"സിസ്റ്റം ഫോൾഡറുകൾ"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"ട്രാഷ് ഫോൾഡർ"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"നിങ്ങളുടെ സെർവറിന്റെ ട്രാഷ് ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"നിങ്ങളുടെ സെർവറിന്റെ ട്രാഷ് ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"അയച്ച ഇനങ്ങളുടെ ഫോൾഡർ"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"നിങ്ങളുടെ സെർവറിന്റെ അയച്ച ഇനങ്ങളുടെ ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"നിങ്ങളുടെ സെർവറിന്റെ അയച്ച ഇനങ്ങളുടെ ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"ദ്രുത പ്രതികരണം"</string>
-    <string name="save_action" msgid="5740359453077441466">"സംരക്ഷിക്കുക"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"കോൺടാക്റ്റുകൾ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"ഈ അക്കൗണ്ടിനായി കോൺടാക്റ്റുകൾ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"കലണ്ടർ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ഈ അക്കൗണ്ടിനായി കലണ്ടർ ഇവന്റ് സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ഇമെയിൽ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ഈ അക്കൗണ്ടിനായി ഇമെയിൽ സമന്വയിപ്പിക്കുക"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"വൈബ്രേറ്റുചെയ്യുക"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"റിംഗ്ടോൺ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"സെർവർ ക്രമീകരണങ്ങൾ"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"സമന്വയ ഓപ്‌ഷനുകൾ"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"സമന്വയ ഓപ്‌ഷനുകൾ (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"ഈ ഫോൾഡർ സമന്വയിപ്പിക്കുക"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"കണക്റ്റുചെയ്‌തിരിക്കുമ്പോൾ സന്ദേശങ്ങൾ ഡൗൺലോഡുചെയ്യും"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"സമന്വയിപ്പിക്കേണ്ട മെയിൽ ദിവസം"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"അയയ്‌ച്ചയാളുടെ ചിത്രം"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"POP ആക്‌സസ്സ് ഉൾപ്പെടുന്ന ചില \"Plus\" അക്കൗണ്ടുകൾ മാത്രമേ ഈ പ്രോഗ്രാമിനെ കണക്റ്റുചെയ്യാൻ അനുവദിക്കുന്നുള്ളൂ. നിങ്ങളുടെ ശരിയായ ഇമെയിൽ വിലാസവും പാസ്‌വേഡും ഉപയോഗിച്ച് സൈൻ ഇൻ ചെയ്യാനാകുന്നില്ലെങ്കിൽ, നിങ്ങൾക്ക് ഒരു പണമടച്ചുള്ള \"Plus\" അക്കൗണ്ട് ഉണ്ടായിരിക്കാനിടയില്ല. ഈ ഇമെയിൽ അക്കൗണ്ടുകളിലേക്ക് ആക്സസ് നേടാൻ വെബ് ബ്രൗസർ സമാരംഭിക്കുക."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"ഈ ഇമെയിൽ അക്കൗണ്ട് സജ്ജീകരിക്കുന്നതിന് മുമ്പാായി, ടി-ഓൺലൈൻ വെബ്‌സൈറ്റ് സന്ദർശിച്ച്  POP3 ഇമെയിൽ ആക്‌സസ്സിനായി ഒരു പാസ്‌വേഡ് സൃഷ്ടിക്കുക."</string>
-    <string name="exchange_name" msgid="3793803477985438102">"കോർപ്പറേറ്റ്"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"അക്കൗണ്ട് സൃഷ്‌ടിക്കാനായില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"ഇമെയിൽ"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"സെർവർ നിർദ്ദിഷ്‌ട സുരക്ഷാ നയങ്ങൾ പ്രവർത്തനക്ഷമമാക്കുന്നു"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"ക്രമീകരണങ്ങൾ"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"പൊതുക്രമീകരണങ്ങൾ"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"ഇല്ലാതാക്കുന്നതിന് മുമ്പ് സ്ഥിരീകരിക്കുക"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"അയയ്‌ക്കുന്നതിന് മുമ്പായി സ്ഥിരീകരിക്കുക"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"ഇമെയിൽ തിരയുക"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"ഉപകരണ ക്യാമറ ഉപയോഗിക്കാൻ അനുവദിക്കരുത്"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"ഉപകരണ പാസ്‌വേഡ് ആവശ്യമാണ്"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"പുതിയ പാസ്‌വേഡുകളുടെ പുനരുപയോഗം നിയന്ത്രിക്കുക"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"കാലഹരണപ്പെടാൻ പാസ്‌വേഡുകൾ ആവശ്യമാണ്"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"ഒരു നിഷ്‌ക്രിയ ഉപകരണത്തിന്റെ ലോക്ക് സ്‌ക്രീൻ ആവശ്യമാണ്"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"സമന്വയിപ്പിക്കേണ്ട കലണ്ടർ ഇവന്റുകളുടെ എണ്ണം പരിമിതപ്പെടുത്തുക"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"സമന്വയിപ്പിക്കേണ്ട ഇമെയിലുകളുടെ എണ്ണം പരിമിതപ്പെടുത്തുക"</string>
-    <string name="quick_1" msgid="9130521670178673190">"നന്ദി!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"ഇത് നല്ലതാണെന്ന് തോന്നുന്നു!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"ഞാൻ ഇത് പിന്നീട് വായിച്ച് നിങ്ങളെ ബന്ധപ്പെടാം."</string>
-    <string name="quick_4" msgid="216066940197616025">"ഇത് ചർച്ചചെയ്യാൻ ഒരു കൂടിക്കാഴ്‌ച സജ്ജമാക്കാൻ അനുവദിക്കുക"</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"റോമിംഗിലായിരിക്കുമ്പോൾ, ഈ അക്കൗണ്ടിനായുള്ള പശ്ചാത്തല സമന്വയം പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"പ്രതികരണം അയയ്ക്കുന്നു…"</string>
-    <string name="no_conversations" msgid="3785854971159919343">"സന്ദേശങ്ങളൊന്നുമില്ല."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"ഫോൾഡർ പിക്കർ"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> എന്നതിനായി സെർവർ ട്രാഷ് ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> എന്നതിനായുള്ള സെർവർ അയച്ച ഇനങ്ങളുടെ ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
-    <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>
-</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index ce322b5..82c1ffa 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Имэйл нийлүүлэгчийн датад хандалт хийх"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Таны хүлээн авсан, илгээсэн зурвасууд, хэрэглэгчдийн нэрс, нууц үгс гэх мэт имэйлийн дата санд хандалт хийхийг апп-д зөвшөөрнө."</string>
     <string name="app_name" msgid="2206468539066258195">"Имэйл"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Кодын алдааг засах"</string>
     <string name="create_action" msgid="6575946089819721958">"Шинийг үүсгэх"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Шуурхай хариулт байхгүй."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Акаунтын тохиргоо"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Холболтын асуудал."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Зурвасыг зөөх"</item>
+    <item quantity="other" msgid="5083310421670206821">"Зурвасуудыг зөөх"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 акаунт дээр зөөх дэмжигддэггүй."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Сонголтонд олон тооны акаунт багтсан учир зөөх боломжгүй."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Ноорог, Гарсан имэйл болон Илгээсэнд байгаа зурвасуудыг зөөх боломжгүй."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Ирсэн мэйл"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Явсан имэйл"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Ноорог"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Жанк"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Одтой"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Уншаагүй"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Кодын алдааг засах"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Ирсэн мэйл"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Одтой"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Ноорог"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Явсан имэйл"</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>\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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Хавсралтыг татаж авч чадсангүй."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Зурвасын кодыг тайлах явцад алдаа гарсан."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Нэг буюу хэд хэдэн хавсралтыг дамжуулж чадсангүй."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Хавсралтыг дамжуулсангүй"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> амжилттай нэвтэрлээ."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Нэвтэрч чадсангүй"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>Б"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>Б"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>КБ"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>КБ"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>МБ"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>МБ"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>ГБ"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>ГБ"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Акаунт тохируулах"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Зөвшөөрөл хүсэж байна"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Нэвтрэх"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Зөв имэйл хаяг болон нууц үг оруулна уу."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Давхардсан Акаунт"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Та энэ хэрэглэгчийн нэрийг \"<xliff:g id="DUPLICATE">%s</xliff:g>\" акаунтад ашиглаж байна."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Энэ нууц үгийн эхэнд буюу адагт нэг буюу хэд хэдэн хоосон зай орсон байна. Ихэнх серверүүд хоосон зайтай нууц үгийг дэмждэггүй."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Акаунтын мэдээллийг татаж байна…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Серверийн тохиргоог баталгаажуулж байна…"</string>
     <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_names_title" msgid="8780121351085082269">"Акаунт тохируулах"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Таны акаунтын тохиргоо хийгдэж имэйл бэлэн боллооYour account is set up and email is on its way!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Энэ акаунтад нэр өгөх (сонголтын)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Таны нэр (илгээж буй зурвасууд дээр харуулах)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Утга оруулах шаардлагатай."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Акаунт тохируулах"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Акаунтын төрөл"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Энэ ямар төрлийн акаунт вэ?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Акаунт тохируулах"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Орж ирж буй серверийн тохиргоо"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ХЭРЭГЛЭГЧИЙН НЭР"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"НУУЦ ҮГ"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Акаунт тохируулах"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Гарч буй серверийн тохиргоо"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP СЕРВЕР"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ПОРТ"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ХАМГААЛАЛТЫН ТӨРӨЛ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Нэвтрэхийг шаардах"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ХЭРЭГЛЭГЧИЙН НЭР"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"НУУЦ ҮГ"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"КЛИЕНТ СЕРТИФИКАТ"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Сонгох"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Клиент сертификат ашиглах"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Устгах"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Хоосон"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"МОБАЙЛ ТӨХӨӨРӨМЖИЙН ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Акаунтын тохиргоо"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"Нэвтрэлт амжилтгүй.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Алсаас аюулгүй байдлыг удирдах"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"<xliff:g id="SERVER">%s</xliff:g> сервер таны Андройд төхөөрөмжийн зарим аюулгүй байдлын функцыг зайнаас удирдах зөвшөөрөл өгөхийг шаардаж байна. Та энэ акаунтын тохируулгыг дуусгах уу?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Энэ сервер дараахийг оруулан таны Андройд төхөөрөмж дээр дэмжигддэггүй аюулгүй байдлын функцыг шаардаж байна: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Та акаунтын хэрэглэгчийн нэрийг өөрчлөх боломжгүй. Өөр хэрэглэгчийн нэртэй акаунт нэмэхийн тулд Акаунт нэмэх гэсэнд хүрнэ үү."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"АНХААРУУЛГА: Имэйл апп-н таны төхөөрөмжийг удирдах эрхийг идэвхгүйжүүлэх нь үүнийг шаарддаг бүх имэйл акаунтыг холбогдох имэйл, харилцагчид, календарийн үйл явдал, бусад датаны хамт устгах болно."</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>
@@ -168,6 +207,9 @@
     <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>-н дата таны төхөөрөмжөөс устгагдаж байна. Та өөрийн дэлгэцийн түгжээний PIN буюу нууц үгийг өөрчлөн үүнийг сэргээж болно. Одоо өөрчлөх уу?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Хадгалагдаагүй өөрчлөлтийг хаях уу?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Нэвтэрч чадсангүй"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g>-н хэрэглэгчийн нэр буюу нууц үг буруу байна. Та эдгээрийг одоо шинэчлэх үү?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Таны <xliff:g id="ACCOUNT">%s</xliff:g>-д нэвтрэх амжилтгүй боллоо; серверийн хариу: <xliff:g id="REASON">%s</xliff:g> Та хэрэглэгчийн нэр болон/буюу нууц үгээ шинэчлэх үү?"</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>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Энэ акаунтын календарийн үйл явдлуудыг синк хийх"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Имэйлийг синк хийх"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Энэ акаунтын имэйлийг синк хийх"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Чичиргэх"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Чичиргэх"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Хонхны ая сонгох"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Серверийн тохиргоо"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Синк сонголтууд"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Энэ фолдерийг синк хийх"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Холбогдсон үед бүх зурвасууд татагдах болно"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Мэйл синк хийх хугацаа"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Илгээгчийн зураг"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Зөвхөн зарим \"Plus\" акаунтууд энэ програмыг холбогдохыг зөвшөөрдөг POP хандалтыг агуулна. Та өөрийн зөв имэйл хаяг болон нууц үгээрээ нэвтрэх боломжгүй байгаа бол та төлбөртэй \"Plus\" акаунтгүй байна. Эдгээр имэйл акаунтын хандалттай болохын тулд веб хөтчийг ажиллуулна уу."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Та энэ имэйл акаунтыг тохируулахын өмнө T-Online Вебсайтруу зочилж POP3 имэйл хандалтын нууц үг үүсгэнэ үү."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Байгууллагын"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Солигч АктивСинк"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Акаунтыг үүсгэж чадсангүй. Дахин оролдоно уу."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Имэйл"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Серверт тохируулсан аюулгүй байдлын бодлогуудыг идэвхжүүлнэ"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Тохиргоо"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Ерөнхий тохиргоо"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Устгахын өмнө баталгаажуулах"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Илгээхийн өмнө баталгаажуулах"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Имэйл хайх"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Төхөөрөмжийн камерыг ашиглахыг зөвшөөрөхгүй"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Төхөөрөмийн нууц үгийг шаардах"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Саяхны нууц үгсийг дахин ашиглахыг хязгаарлах"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Дажгүй санагдаж байна!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Би үүнийг дараа уншаад танруу холбоо барина."</string>
     <string name="quick_4" msgid="216066940197616025">"Уулзалт зохион байгуулж энэ асуудлыг ярилцая."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Роумингын үеэр энэ акаунтын арын синк хийхийг идэвхгүйжүүлсэн."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Хариулт илгээж байна…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Хувийн (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Хувийн (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Мессеж байхгүй."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Фолдер сонгогч"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g>-н серверийн хогийн савны фолдерыг сонгоно уу"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g>-н серверийн илгээсэн зурвасуудын фолдерыг сонгоно уу"</string>
     <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>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
deleted file mode 100644
index c37e554..0000000
--- a/res/values-mr-rIN/strings.xml
+++ /dev/null
@@ -1,296 +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">"ईमेल संलग्नके वाचा"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"आपली ईमेल संलग्नके वाचण्यास अॅप ला अनुमती देते."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"ईमेल प्रदाता डेटावर प्रवेश करा"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"प्राप्त केलेले संदेश, पाठविलेले संदेश, वापरकर्तानावे आणि संकेतशब्द यासह, आपल्या ईमेल डेटाबेसवर प्रवेश करण्यासाठी अॅप ला अनुमती देते."</string>
-    <string name="app_name" msgid="2206468539066258195">"ईमेल"</string>
-    <string name="debug_title" msgid="1337476992195531309">"डीबग करा"</string>
-    <string name="create_action" msgid="6575946089819721958">"नवीन तयार करा"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"द्रुत प्रतिसाद नाहीत."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"खाते सेटिंग्ज"</string>
-    <string name="status_network_error" msgid="526826323872477973">"कनेक्शन समस्या."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"संदेश हलवा"</item>
-    <item quantity="other" msgid="5083310421670206821">"संदेश हलवा"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"हलविणे POP3 खात्यांवर समर्थित नाही."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"निवडीमध्ये एकाधिक खाती असल्यामुळे हलवू शकत नाही."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"मसुदे, आउटबॉक्स आणि प्रेषित मधील संदेश हलविले जाऊ शकत नाहीत."</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"इनबॉक्स"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"आउटबॉक्स"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"मसुदे"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"कचरा"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"प्रेषित"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"जंक"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"तारांकित"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"न वाचलेले"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"इनबॉक्स"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"तारांकित"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"मसुदे"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"आउटबॉक्स"</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>\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>
-    <string name="attachment_not_found" msgid="5219773045406833000">"संलग्नक डाउनलोड करू शकलो नाही."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"संदेश डीकोड करताना एक त्रुटी आली."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"एक किंवा अधिक संलग्नके अग्रेषित करू शकलो नाही."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"संलग्नक अग्रेषित केले नाही"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> साइन इन अयशस्वी."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"साइन इन करू शकलो नाही"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"खाते सेटअप"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"प्राधिकृततेसाठी विनंती करत आहे"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"साइन इन करा"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"प्रमाणीकृत करण्यात अक्षम"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"ईमेल पत्ता किंवा संकेतशब्द चुकीचे आहेत"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"ईमेल पत्ता:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"ईमेल खाते"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"आपण फक्त थोड्या चरणांमध्ये आपले खाते सेट करू शकता."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"ईमेल पत्ता"</string>
-    <string name="or_label" msgid="6408695162723653446">"किंवा"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google सह साइन इन करा"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"संकेतशब्द"</string>
-    <string name="password_hint" msgid="4226682910292828279">"संकेतशब्द"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s सह साइन इन केले"</string>
-    <string name="authentication_label" msgid="914463525214987772">"प्रमाणीकरण"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"प्रमाणीकरण जोडा"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"प्रमाणीकरण साफ करा"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"व्यक्तिचलित सेटअप"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"एक वैध ईमेल पत्ता आणि संकेतशब्द टाइप करा."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"डुप्लिकेट खाते"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"आपण \"<xliff:g id="DUPLICATE">%s</xliff:g>\" खात्यासाठी हे वापरकर्तानाव आधीपासूनच वापरत आहात."</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"हा संकेतशब्द एक किंवा अधिक अवकाश वर्णांसह प्रारंभ होतो किंवा समाप्त होतो. अनेक सर्व्हर अवकाश असलेल्या संकेतशब्दांना समर्थन देत नाहीत."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"खाते माहिती पुनर्प्राप्त करत आहे…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"सर्व्हर सेटिंग्जचे प्रमाणीकरण करत आहे…"</string>
-    <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_names_title" msgid="8780121351085082269">"खाते सेटअप"</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>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"हे फील्ड रिक्त असू शकत नाही."</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"खाते सेटअप"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"खाते प्रकार"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"हे खाते कोणत्या प्रकारचे आहे?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"खाते सेटअप"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"येणार्‍या सर्व्हर सेटिंग्ज"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"वापरकर्तानाव"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"संकेतशब्द"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"संकेतशब्द"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"सर्व्हर"</string>
-    <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_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>
-    <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_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>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"खाते सेटअप"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"जाणार्‍या सर्व्हर सेटिंग्ज"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP सर्व्हर"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"पोर्ट"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"सुरक्षितता प्रकार"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"साइन इन आवश्यक"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"वापरकर्तानाव"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"संकेतशब्द"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"क्लायंट प्रमाणपत्र"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"निवडा"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"क्लायंट प्रमाणपत्र वापरा"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"काढा"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"काहीही नाही"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"मोबाईल डिव्हाइस ID"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"खाते सेटिंग्ज"</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_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>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"दर 15 मिनिटांनी"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"दर 30 मिनिटांनी"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"दर तासाला"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"ईमेल येते तेव्हा मला सूचित करा"</string>
-    <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">"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>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"अंतिम दिवस"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"अंतिम तीन दिवस"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"गेला आठवडा"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"गेले दोन आठवडे"</string>
-    <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_fmt" msgid="8811464534757505457">"लॉग इन अयशस्वी. \n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"सर्व्हरशी सुरक्षितपणे कनेक्ट करू शकत नाही. \n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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_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>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"सर्व्हरवरील कनेक्शन उघडू शकलो नाही."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"आपण चुकीचा सर्व्हर पत्ता टाईप केला आहे किंवा सर्व्हरला ईमेल समर्थन करत नसलेली प्रोटोकॉल आवृत्ती आवश्यक आहे."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"आपल्याला या सर्व्हरसह संकालन करण्याची परवानगी नाही. अधिक माहितीसाठी आपल्या सर्व्हरच्या प्रशासकाशी संपर्क साधा."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"दूरस्थ सुरक्षितता प्रशासन"</string>
-    <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"आपण खात्याचे वापरकर्तानाव बदलू शकत नाही. भिन्न वापरकर्तानावाने खाते जोडण्यासाठी, खाते जोडा स्पर्श करा."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"चेतावणी: आपले डिव्हाइस चालविण्यासाठी ईमेल अॅपचे अधिकार निष्क्रिय केल्याने, ज्या खात्यांना त्याची आवश्यकता आहे ती सर्व खाती त्यांचे ईमेल, संपर्क, कॅलेंडर इव्हेंट आणि अन्य डेटा यासह हटवली जातील."</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_change_title" msgid="615639963487448183">"सुरक्षितता धोरणे बदलली आहेत"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"सुरक्षितता धोरणांची पूर्तता केली जाऊ शकत नाही"</string>
-    <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_content_title" msgid="4360288708739366810">"लॉक स्क्रीन संकेतशब्द कालबाह्य होत आहे"</string>
-    <string name="password_expired_ticker" msgid="3098703963402347483">"आपला लॉक स्क्रीन पिन किंवा संकेतशब्द कालबाह्य झाला आहे."</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_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_login_dialog_title" msgid="2250911725501042470">"साइन इन करू शकलो नाही"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> साठीचे वापरकर्तानाव किंवा संकेतशब्द चुकीचे आहे. आपण ते आता अद्यतनित करू इच्छिता?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"आपले <xliff:g id="ACCOUNT">%s</xliff:g> वरील लॉग इन अयशस्वी झाले; सर्व्हर हे म्हणाला: <xliff:g id="REASON">%s</xliff:g> आपण आपले वापरकर्तानाव आणि/किंवा संकेतशब्द अद्यतनित करू इच्छिता?"</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>
-    <string name="account_settings_summary" msgid="4733776978291376161">"संकालन वारंवारता, सूचना इ."</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"ईमेल येते तेव्हा सूचना पाठवा"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"संकालन वारंवारता"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"येणार्‍या सेटिंग्ज"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"वापरकर्तानाव, संकेतशब्द आणि अन्य येणार्‍या सर्व्हर सेटिंग्ज"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"जाणार्‍या सेटिंग्ज"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"वापरकर्तानाव, संकेतशब्द आणि अन्य जाणार्‍या सर्व्हर सेटिंग्ज"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"धोरणांची अंमलबजावणी केली"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"काहीही नाही"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"असमर्थित धोरणे"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"काहीही नाही"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"संकालनाचा प्रयत्न करा"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"हे खाते संकालित करण्यासाठी येथे स्पर्श करा"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"खाते नाव"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"आपले नाव"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"द्रुत प्रतिसाद"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"ईमेल तयार करताना आपण वारंवार घालता तो मजकूर संपादित करा"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"सूचना सेटिंग्ज"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"डेटा वापर"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"सुरक्षितता धोरणे"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"सिस्टीम फोल्डर"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"कचरा फोल्डर"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"आपल्या सर्व्हरचे कचरा फोल्डर निवडा"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"आपल्या सर्व्हरचे कचरा फोल्डर निवडा"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"प्रेषित आयटम फोल्डर"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"आपल्या सर्व्हरचे पाठविलेले आयटम फोल्डर निवडा"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"आपल्या सर्व्हरचे प्रेषित आयटम फोल्डर निवडा"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"द्रुत प्रतिसाद"</string>
-    <string name="save_action" msgid="5740359453077441466">"जतन करा"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"संपर्क संकालित करा"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"या खात्यासाठी संपर्क संकालित करा"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"कॅलेंडर संकालित करा"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"या खात्यासाठी कॅलेंडर इव्हेंट संकालित करा"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"संकालन ईमेल"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"या खात्यासाठी ईमेल संकालित करा"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"कंपन होणे"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"रिंगटोन निवडा"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"सर्व्हर सेटिंग्ज"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"संकालन पर्याय"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"संकालन पर्याय (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"हे फोल्डर संकालित करा"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"कनेक्ट केलेले असते तेव्हा संदेश डाउनलोड होतील"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"संकालन करण्यासाठी मेलचे दिवस"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"प्रेषक प्रतिमा"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"केवळ काही \"प्लस\" खाती या प्रोग्रामला कनेक्ट होण्यास अनुमती देऊन POP प्रवेश समाविष्ट करतात. आपण आपल्या योग्य ईमेल पत्त्यासह आणि संकेतशब्दासह साइन इन करण्यात सक्षम होत नसल्यास, आपल्याकडे सशुल्क \"प्लस\" खाते नसू शकते. ह्या ईमेल खात्यांवर प्रवेश मिळवण्यासाठी वेब ब्राउझर लाँच करा."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"हे ईमेल खाते सेट करण्यापूर्वी, T-ऑनलाइन वेबसाइटला भेट द्या आणि POP3 ईमेल प्रवेशाकरिता एक संकेतशब्द तयार करा."</string>
-    <string name="exchange_name" msgid="3793803477985438102">"कॉर्पोरेट"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"खाते तयार करू शकलो नाही. पुन्हा प्रयत्न करा."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"ईमेल"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"सर्व्हर-निर्दिष्ट सुरक्षितता धोरणे सक्षम करते"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"सेटिंग्ज"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"सामान्य सेटिंग्ज"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"हटविण्यापूर्वी पुष्टी करा"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"पाठविण्यापूर्वी पुष्टी करा"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"ईमेल शोधा"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"डिव्हाइसचा कॅमेरा वापरण्याची अनुमती रद्द करा"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"डिव्हाइस संकेतशब्द आवश्यक"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"अलीकडील संकेतशब्द पुनर्वापरासाठी प्रतिबंधित करा"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"संकेतशब्द कालबाह्य होणे आवश्यक"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"त्याची स्क्रीन लॉक करण्यासाठी निष्क्रिय डिव्हाइस आवश्यक"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"संकालित केलेल्या कॅलेंडर इव्हेंटची संख्या मर्यादित करा"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"संकालित केलेल्या ईमेलची संख्या मर्यादित करा"</string>
-    <string name="quick_1" msgid="9130521670178673190">"धन्यवाद!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"मला छान वाटतंय!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"मी हे नंतर वाचेन आणि परत आपल्याशी संपर्क साधेन."</string>
-    <string name="quick_4" msgid="216066940197616025">"याची चर्चा करण्यासाठी एक संमेलन सेट करू या."</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"रोमिंगमध्ये असताना या खात्यासाठीचे पार्श्वभूमी संकालन अक्षम केले आहे."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"प्रतिसाद पाठवित आहे…"</string>
-    <string name="no_conversations" msgid="3785854971159919343">"कोणतेही संदेश नाहीत."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"फोल्डर निवडक"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> साठी सर्व्हर कचरा फोल्डर निवडा"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> साठी सर्व्हरने पाठविलेले आयटम फोल्डर निवडा"</string>
-    <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>
-</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 9db8140..e19c361 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Akses data pembekal e-mel"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Membenarkan apl ini mengakses pangkalan data e-mel anda, termasuk mesej diterima, mesej dihantar, nama pengguna dan kata laluan."</string>
     <string name="app_name" msgid="2206468539066258195">"E-mel"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Nyahpepijat"</string>
     <string name="create_action" msgid="6575946089819721958">"Buat baru"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Tiada tindak balas cepat."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Tetapan akaun"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Masalah sambungan."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Alihkan mesej"</item>
+    <item quantity="other" msgid="5083310421670206821">"Alihkan mesej"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Pengalihan tidak disokong pada akaun POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Tidak boleh dialihkan kerana pilihan mengandungi berbilang akaun."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Mesej dalam Draf, Peti Keluar dan Dihantar tidak boleh dialihkan."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Peti masuk"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Peti Keluar"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Draf"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Sarap"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Dibintangkan"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Belum dibaca"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Nyahpepijat"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Peti masuk"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Berbintang"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Draf"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Peti Keluar"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Gabungan paparan"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Mesej Asal --------\nSubjek: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDaripada: <xliff:g id="SENDER">%2$s</xliff:g>\nKepada: <xliff:g id="TO">%3$s</xliff:g>\nSK: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Sisipkan respons pantas"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Sisipkan respons pantas"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Satu atau lebih lampiran dalam mesej anda yang dikirim semula akan dimuat turun sebelum dihantar."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Tidak dapat memuat turun lampiran."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Terdapat ralat semasa menyahkodkan mesej."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Tidak boleh mengirim semula satu atau lebih lampiran."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Lampiran tidak dikirim semula"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> log masuk gagal."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Tidak dapat melog masuk"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Persediaan akaun"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Meminta kebenaran"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Log masuk"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Taipkan alamat e-mel dan kata laluan yang sah."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Akaun pendua"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Anda telah menggunakan nama pengguna ini untuk akaun \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Kata laluan ini dimulakan atau berakhir dengan satu atau lebih aksara ruang. Banyak pelayan tidak menyokong kata laluan dengan ruang."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Mendapatkan semula maklumat akaun..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Mengesahkan tetapan pelayan…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Mengesahkan tetapan smtp…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Membuat akaun..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Sahkan jenis akaun"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Anda menyatakan <xliff:g id="EMAIL">%1$s</xliff:g> menggunakan <xliff:g id="USERPROTOCOL">%2$s</xliff:g> tetapi akaun itu mungkin menggunakan <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Persediaan akaun"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Akaun anda sudah disediakan dan e-mel akan muncul sebentar lagi!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Namakan akaun ini (pilihan)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Nama anda (dipaparkan pada mesej keluar)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Medan ini tidak boleh kosong."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Persediaan akaun"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Jenis akaun"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Jenis apakah akaun ini?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Persediaan akaun"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Tetapan pelayan masuk"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NAMA PENGGUNA"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"KATA LALUAN"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Apabila saya memadamkan dari Peti Masuk"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Awalan laluan IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Pilihan"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Persediaan akaun"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Tetapan pelayan keluar"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"PELAYAN SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"JENIS KESELAMATAN"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Memerlukan log masuk"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NAMA PENGGUNA"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"KATA LALUAN"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"SIJIL KLIEN"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Pilih"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Gunakan sijil klien"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Alih keluar"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Tiada"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID PERANTI MUDAH ALIH"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Tetapan akaun"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Pilihan akaun"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Kekerapan menyegerak:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Jangan sekali-kali"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Semua"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Gunakan tetapan asal akaun"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Nama pengguna atau kata laluan salah."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Log masuk gagal.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Masalah dengan persediaan akaun"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Sahkan nama pengguna, kata laluan dan tetapan akaun adalah benar."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Tidak boleh menyambung ke pelayan dengan selamat."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Pentadbiran keselamatan jauh"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Pelayan <xliff:g id="SERVER">%s</xliff:g> menghendaki anda membenarkannya mengawal beberapa ciri keselamatan peranti Android anda secara jauh. Adakah anda mahu menyelesaikan persediaan akaun ini?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Pelayan ini memerlukan ciri-ciri keselamatan yang tidak disokong oleh peranti Android anda, termasuk: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Anda tidak boleh menukar nama pengguna akaun. Untuk menambahkan akaun dengan nama pengguna yang lain, sentuh Tambahkan Akaun."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"AMARAN: Menyahaktifkan autoriti aplikasi E-mel untuk mentadbir peranti anda akan memadamkan semua akaun e-mel yang memerlukannya, bersama-sama dengan e-mel, kenalan, acara kalendar dan datanya yang lain."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Kemas kini keselamatan"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> memerlukan anda untuk mengemas kini tetapan keselamatan anda."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Kata laluan kunci skrin telah tmt tempoh"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Data untuk <xliff:g id="ACCOUNT">%s</xliff:g> sedang dipadamkan dari peranti anda. Anda boleh memulihkannya dengan menukar PIN atau kata laluan kunci skrin anda. Adakah anda ingin menukarnya sekarang?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Buang perubahan yang belum disimpan?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Tidak dapat melog masuk"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Nama pengguna atau kata laluan untuk <xliff:g id="ACCOUNT">%s</xliff:g> adalah tidak betul. Adakah anda mahu mengemaskininya sekarang?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Log masuk anda ke <xliff:g id="ACCOUNT">%s</xliff:g> telah gagal; mesej pelayan: <xliff:g id="REASON">%s</xliff:g> Adakah anda mahu mengemas kini nama pengguna dan/atau kata laluan anda?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Muat turun lampiran"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Auto muat turun lampiran ke mesej terbaharu melalui Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Pemberitahuan e-mel"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Segerakkan acara kalendar untuk akaun ini"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Segerakkan e-mel"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Segerakkan e-mel untuk akaun ini"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Getar"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Getar"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Pilih nada dering"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Tetapan pelayan"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Pilihan segerak"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Segerakkan folder ini"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Mesej akan dimuat turun apabila disambungkan"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Bilangan hari untuk menyegerakkan mel"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Imej penghantar"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Hanya sesetengah akaun \"Plus\" sahaja yang menyertakan akses POP, membenarkan program ini untuk menyambung. Jika anda tidak boleh melog masuk dengan alamat dan kata laluan e-mel anda yang betul, anda mungkin tidak mempunyai akaun \"Plus\" berbayar. Sila lancarkan penyemak imbas Web untuk mendapatkan akses kepada akaun e-mel ini."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Sebelum menyediakan akaun e-mel ini, sila lawati tapak Web T-Online dan buat kata laluan untuk akses e-mel POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Syarikat"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Tidak dapat membuat akaun. Sila cuba lagi."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-mel"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Mendayakan dasar keselamatan tentuan pelayan"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Tetapan"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Tetapan umum"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Sahkan sebelum memadam"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Sahkan sebelum menghantar"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Cari e-mel"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Jgn benarkan penggunaan kamera peranti"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Perlukan kata laluan peranti"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Hadkan penggunaan semula kata laluan terbaru"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Saya setuju saja!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Saya akan baca ini nanti dan hubungi anda semula."</string>
     <string name="quick_4" msgid="216066940197616025">"Mari adakan mesyuarat untuk membincangkannya."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Segerakkan latar belakang untuk akaun ini dilumpuhkan semasa perayauan."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Menghantar jawapan…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Peribadi (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Peribadi (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Tiada mesej."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Pemilih folder"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Pilih folder sampah pelayan untuk <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Pilih folder item yang dihantar pelayan untuk <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Memuatkan senarai folder..."</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Tiada respons tersedia"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Tetapan penyegerakan folder"</string>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
deleted file mode 100644
index 9a80f09..0000000
--- a/res/values-my-rMM/strings.xml
+++ /dev/null
@@ -1,250 +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">"အီးမေးလ် ပူးတွဲမှုများကို ဖတ်ရန်"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"appအား သင့် အီးမေးလ် ပူးတွဲမှုများကို ဖတ်ရှုခွင့် ပြုသည်။"</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"အီးမေးလ် စီမံပေးသူ ဒေတာကို ရယူပါ"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"appအား သင့်အီးမေးလ် ဒေတာဘေ့စ်ကို၊ ရရှိပြီး စာများ၊ ပို့ပြီး စာများ၊ သုံးစွဲသူ အမည်များ နှင့် စကားဝှက်များ အပါအ၀င်ကို အသုံးချခွင့် ပြုသည်။"</string>
-    <string name="app_name" msgid="2206468539066258195">"အီးမေးလ်"</string>
-    <string name="debug_title" msgid="1337476992195531309">"ဒီဘာဂ်"</string>
-    <string name="create_action" msgid="6575946089819721958">"အသစ် ဖန်တီးရန်"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"အမြန် တုံ့ပြန်မှုများ မရှိ"</string>
-    <string name="account_settings_action" msgid="589969653965674604">"အကောင့် ဆက်တင်များ"</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"ဝင်စာ"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"ထွက်စာများ"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"မူကြမ်းများ"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"အမှိုက်"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"ပို့ပြီး"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"အမှိုက်"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"စတားပါ"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"မဖတ်ရသေး"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"ဝင်စာ"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"စတားပါ"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"မူကြမ်းများ"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"ထွက်စာများ"</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>\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>
-    <string name="message_decode_error" msgid="91396461771444300">"စာကို ကုဒ်ဖွင့်နေစဉ် အမှားရှိခဲ့သည်။"</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"ပူးတွဲမှု တစ်ခု သို့မဟုတ် ပိုများပြီး တစ်ဆင့် ပို့မပေးနိုင်ခဲ့ပါ။"</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"ပူးတွဲမှုကို တစ်ဆင့် မပို့ခဲ့"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> လက်မှတ်ထိုး၀င်မှု မအောင်မြင်"</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"လက်မှတ်ထိုး မ၀င်နိုင်ခဲ့ပါ"</string>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"အကောင့် စဖွင့်သတ်မှတ်မှု"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"ခွင့်ပြုချက် တောင်းဆိုနေ"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"လက်မှတ်ထိုး ၀င်ရန်"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"အထောက်အထား မစိစစ်နိုင်"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"အီးမေးလ် လိပ်စာ သို့မဟုတ် စကားဝှက် မမှန်ပါ"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"အီးမေးလ် လိပ်စာ:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"အီးမေးလ် အကောင့်"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"သင်သည် သင်၏ အကောင့်ကို အဆင့်အနည်းငယ်မျှဖြင့် စသတ်မှတ်နိုင်သည်။"</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"အီးမေး လိပ်စာ"</string>
-    <string name="or_label" msgid="6408695162723653446">"သို့မဟုတ်"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google ဖြင့် လက်မှတ် ထိုးဝင်ပါ"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"စကားဝှက်"</string>
-    <string name="password_hint" msgid="4226682910292828279">"စကားဝှက်"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s ဖြင့် လက်မှတ်ထိုး ၀င်ခဲ့"</string>
-    <string name="authentication_label" msgid="914463525214987772">"အထောက်အထားစိစစ်မှု"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"အထောက်အထား စိစစ်မှုကို ထည့်ရန်"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"အထောက်အထားစိစစ်မှုကို ရှင်းရန်"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"လက်ဖြင့် သတ်မှတ်ရန်"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"မှန်သော အီးမေးလ် လိပ်စာ နှင့် စကားဝှက်ကို ရိုက်ထည့်ပါ။"</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"အကောင့်ကို ပွားယူရန်"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"သင်သည် \"<xliff:g id="DUPLICATE">%s</xliff:g>\" အကောင့်အတွက် ဤ သုံးစွဲသူအမည်ကို အသုံးပြုနေပြီ ဖြစ်သည်။"</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"အကောင့် အချက်အလက်များကို ထုတ်ယူနေသည်…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"ဆာဗာ ဆက်တင်များ၏ မှန်ကန်မှုကို စိစစ်နေ…"</string>
-    <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_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>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"အကောင့် ပုံစံ"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"ဒါက ဘယ်လို အကောင့် အမျိုးအစားလဲ?"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"အဝင် ဆာဗာ ဆက်တင်များ"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"သုံးစွဲသူအမည်"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"စကားဝှက်"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"စကားဝှက်"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"ဆာဗာ"</string>
-    <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_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>
-    <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_delete_label" msgid="8677018382715596606">"ကျွန်ုပ်က ဝင်စာမှ ဖျက်လျှင်"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAPလမ်းကြောင်း၏ ရှေ့ဆက်ပုဒ်"</string>
-    <!-- unknown quoting pattern: original -1, translation 1 -->
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"&amp;lt;လိုချင်မှ ရွေးရန်&amp;gt;"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"အထွက် ဆာဗာ ဆက်တင်များ"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP ဆာဗာ"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ပို့တ်"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"လုံခြုံမှု ပုံစံ"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"လက်မှတ်ထိုး၀င်ရန် လိုအပ်"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"သုံးစွဲသူအမည်"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"စကားဝှက်"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"သုံးစွဲသူ လက်မှတ်"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"ရွေးရန်"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"သုံးစွဲသူ လက်မှတ်ကို အသုံးပြုပါ"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"ဖယ်ရှားရန်"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"မရှိ"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"မိုဘိုင်း ကိရိယာ ID"</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_push" msgid="5511415696925307797">"အလိုအလျောက် (တွန်းပါ)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="8929785860545198867">"၅ မိနစ် တိုင်း"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="8787901333816702849">"၁၀ မိနစ်တိုင်း"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"၁၅ မိနစ်တိုင်း"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"၃၀ မိနစ်တိုင်း"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"နာရီ တိုင်း"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"အီးမေးလ် ရောက်လျှင် ကျွန်ုပ်ကို အသိပေးပါ"</string>
-    <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_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>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"နောက်ဆုံးနေ့"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"လွန်ခဲ့သော သုံးရက်"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"ပြီးခဲ့သော အပတ်"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"လွန်ခဲ့သော နှစ်ပတ်"</string>
-    <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_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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"ဆာဗာသို့ လုံခြုံစွာ မချိတ်ဆက်နိုင်ပါ။ \n<xliff:g id="ERROR">%s</xliff:g>"</string>
-    <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_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>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"ဆာဗာသို့ ချိတ်ဆက်မှုကို မဖွင့်နိုင်ခဲ့ပါ။"</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"သင်က မမှန်သည့် ဆာဗာ လိပ်စာ ရိုက်သွင်းခဲ့သည် သို့မဟုတ် ဆာဗာ လိုအပ်သည့် ပရိုတိုကော ဗားရှင်းကို အီးမေးလ်မှ ပံ့ပိုးမပေးပါ။"</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"ဤဆာဗာနှင့် စင့်က်လုပ်ရန် ခွင့်ပြုချက် သင့်ထံတွင် မရှိပါ။ ပိုပြီး သိရှိရန် သင့်ဆာဗာ၏ အုပ်ချုပ်ရေးမှူးကို ဆက်သွယ်ပါ။"</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"အဝေးမှ လုံခြုံရေး အုပ်ချုပ်မှု"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"ဆာဗာ <xliff:g id="SERVER">%s</xliff:g> က သင့် အန်ဒရွိုက် ကိရိယာ၏ အချို့သော လုံခြုံရေး အင်္ဂါရပ်များကို ပြင်ပမှ ထိန်းချုပ်မှာကို သင့် အနေနှင့် ခွင့်ပြုရန် လိုအပ်သည်။ ဤအကောင့် ဆက်တင်ကို ပြီးအောင် သင် လုပ်လိုပါသလား?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"ဤ ဆာဗာက သင့် အန်ဒရွိုက်ကိရိယာမှ ပံ့ပိုးမပေးသည့် <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_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_change_title" msgid="615639963487448183">"လုံခြုံရေး မူဝါဒများ ပြောင်းလဲခဲ့သည်"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"လုံခြုံရေး မူဝါဒများကို မပြည့်မီနိုင်ပါ"</string>
-    <string name="account_security_title" msgid="6072273231606918870">"ကိရိယာ လုံခြုံရေး"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="2527501853520160827">"ဆာဗာ <xliff:g id="SERVER">%s</xliff:g> ကို သင့်အန်ဒရွိုက် ကိရိယာ၏ လုံခြုံရေး အင်္ဂါရပ် အချို့ကို အဝေးမှ ထိန်းချုပ်ခွင့် ပြုရန် လိုအပ်သည်။"</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>\" အတွက် သင့်မျက်နှာပြင် သော့ချ PIN သို့မဟုတ် စကားဝှက်ကို ပြောင်းလဲရန် လိုသည်။"</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"စခရင် သော့စကားဝှက် ကုန်ဆုံး"</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">"သင်သည် သင်၏ မျက်နှာပြင် သော့ချမှု 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> အတွက် ဒေတာကို သင့်ကိရိယာထဲမှ ဖျက်နေသည်။ သင်သည် သင်၏ မျက်နှာပြင် သော့ချမှု 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_notify_label" msgid="8621226576645167987">"အီးမေးလ် အကြောင်းကြားချက်များ"</string>
-    <string name="account_settings_summary" msgid="4733776978291376161">"စင့်က် ကြိမ်နှုန်း၊ အကြောင်းကြားချက်များ၊ စသဖြင့်။"</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"အီးမေးလ် ရောက်ရှိလျှင် အကြောင်းကြားချက် ပို့ရန်"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"စင့်က် ကြိမ်နှုန်း"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"ဝင်စာ ဆက်တင်များ"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"သုံးစွဲသူအမည်၊ စကားဝှက်၊ နှင့် အခြား ၀င်စာ ဆာဗာ ဆက်တင်များ"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"ထွက်စာ ဆက်တင်များ"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"သုံးစွဲသူအမည်၊ စကားဝှက်၊ နှင့် အခြား ထွက်စာ ဆာဗာ ဆက်တင်များ"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"မူဝါဒများ ပြဌာန်းထား"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"မရှိ"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"ပံ့ပိုးမပေးသည့် မူဝါဒများ"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"မရှိ"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"စင့်က် လုပ်ရန် ကြိုးပမ်းမှု"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"ဤ အကောင့်ကို စင့်က်လုပ်ရန် ဒီမှာ ထိပါ"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"အကောင့် အမည်"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"သင်၏ အမည်"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"အမြန် တုံ့ပြန်ချက်များ"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"အီးမေးလ် ရေးဖွဲ့ရာမှာ သင် မကြာခဏ ထည့်သွင်းသော စာသားကို တည်းဖြတ်"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"အကြောင်းကြားချက် ဆက်တင်များ"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"ဒေတာ သုံးစွဲမှု"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"လုံခြုံရေး မူဝါဒများ"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"စနစ် ဖိုလ်ဒါများ"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"အမှိုက် ဖိုလ်ဒါ"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"သင့်ဆာဗာ၏ အမှိုက်ပုံး ဖိုလ်ဒါကို ရွေးရန်"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"သင့်ဆာဗာ၏ အမှိုက်ပုံး ဖိုလ်ဒါကို ရွေးရန်"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"ပို့ပြီး အရာများ ဖိုလ်ဒါ"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"သင့်ဆာဗာ၏ ပို့ပြီး အရာများ ဖိုလ်ဒါကို ရွေးရန်"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"သင့်ဆာဗာ၏ ပို့ပြီး အရာများ ဖိုလ်ဒါကို ရွေးရန်"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"အမြန် တုံ့ပြန်ချက်"</string>
-    <string name="save_action" msgid="5740359453077441466">"သိမ်းဆည်းရန်"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"ဆက်သွယ်များ စင့်က်"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"ဤအကောင့် အဆက်အသွယ်များ စင့်က်လုပ်"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"ပြက္ခဒိန် စင့်က်လုပ်"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ဤ အကောင့်အတွက် ပြက္ခဒိန် ဖြစ်ရပ်ကို စင့်က်လုပ်ရန်"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"အီးမေးလ် စင့်က်လုပ်"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ဒီအကောင့် အီးမေးလ်ကို စင့်က်လုပ်ရန်"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"တုန်ခါမှု"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"သံစဉ်ကို ရွေးချယ်ရန်"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"ဆာဗာ ဆက်တင်များ"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"စင့်က် ရွေးစရာများ"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"စင့်က် ရွေးစရာများ (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"ဤ ဖိုလ်ဒါကို စင့်က် လုပ်ရန်"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"ချိတိ်ဆက်ချိန်မှာ စာများကို ဒေါင်းလုဒ် လုပ်မည်"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"နေ့ကြာ စာကို စင့်က် လုပ်ရန်"</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"ယခု အီးမေးလ် အကောင့်ကို စမသတ်မှတ်မီ T-အွန်လိုင်း ၀က်ဘ် ဆိုဒ်ကို ဝင်ကာ POP3 အီးမေးလ်ကို ရယူရန် စကားဝှက်ကို ဖန်တီးပါ။"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"အကောင့်ကို မဖန်တီးနိုင်ခဲ့ပါ။ ထပ်စမ်းပါ။"</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"အီးမေးလ်"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"ဆာဗာမှ သတ်မှတ်ခဲ့သည့် လုံခြုံရေး မူဝါဒများကို ဖွင့်ပေးသည်"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"ကိရိယာ၏ ကင်မရာကို အသုံးပြုမှု ခွင့်မပြု"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"ကိရိယာ၏ စကားဝှက် လိုအပ်"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"မကြာခင်က စကားဝှက်များ ပြန်သုံးမှုကို ကန့်သတ်ရန်"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"စကားဝှက် သက်တမ်း ကုန်သွားမှာကို လိုအပ်သည်"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"မျက်နှာပြင် သော့ချရန် မလှုပ်ရှားသည့် ကိရိယာ လိုအပ်"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"စင့်က် လုပ်ထား ပြက္ခဒိန် ဖြစ်ရပ် အရေအတွက် ကန့်သတ်"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"စင့်က်လုပ်ပြီး အီးမေးလ် အရေအတွက်ကို ကန့်သတ်ရန်"</string>
-    <string name="quick_1" msgid="9130521670178673190">"ကျေးဇူးပဲ!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"ကြားရတာ ကျွန်ုပ် အတွက် ကောင်းပါသည်!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"ဤစာကို ကျွနု်ပ် ဖတ်ပြီးနောက် သင့်ထံသို့ ပြန်ကြားမည်။"</string>
-    <string name="quick_4" msgid="216066940197616025">"ဒါကို ဆွေးနွေးရန် အစည်းအဝေး တစ်ခု စီစဉ်ကြရအောင်။"</string>
-    <string name="confirm_response" msgid="6764021931370809514">"တုံ့ပြန်ချက် ပို့နေ…"</string>
-    <string name="no_conversations" msgid="3785854971159919343">"စာများ မရှိ"</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"ဖိုလ်ဒါ ကောက်ယူသူ"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g>တွက် ဆာဗာ အမှိုက် ဖိုလ်ဒါ ရွေး"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g>အတွက် ဆာဗာမှ ပို့ချက်များ ဖိုလ်ဒါရွေး"</string>
-    <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>
-</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 2eaad32..ddbf842 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Få tilgang til data om e-postleverandør"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Gir appen tilgang til e-postdatabasen, herunder mottatte meldinger, sendte meldinger, brukernavn og passord."</string>
     <string name="app_name" msgid="2206468539066258195">"E-post"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Feilsøking"</string>
     <string name="create_action" msgid="6575946089819721958">"Opprett ny"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Ingen hurtigsvar."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Kontoinnstillinger"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Tilkoblingsproblem."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Flytt e-post"</item>
+    <item quantity="other" msgid="5083310421670206821">"Flytt e-poster"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Flytting støttes ikke for POP3-kontoer."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Kan ikke flytte fordi utvalget inneholder flere kontoer."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Meldinger i Utkast, Utboks og Sendte kan ikke flyttes."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Innboks"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Utboks"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Utkast"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Nettsøppel"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Stjernemerket"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Ikke lest"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Feilsøking"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Innboks"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Stjernemerket"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Utkast"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Utboks"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Kombinert visning"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Opprinnelig e-post --------\nEmne: <xliff:g id="SUBJECT">%1$s</xliff:g>\nFra: <xliff:g id="SENDER">%2$s</xliff:g>\nTil: <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">"Sett inn hurtigsvar"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Sett inn hurtigsvar"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Ett eller flere vedlegg i den videresendte e-posten blir lastet ned før du sender."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Kunne ikke laste ned vedlegget."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Det oppstod en feil under dekoding av meldingen."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Kunne ikke videresende ett eller flere vedlegg."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Vedlegget ble ikke videresendt"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Pålogging til <xliff:g id="ACCOUNT_NAME">%s</xliff:g> mislyktes."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Kunne ikke logge på"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Konfigurering av konto"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Ber om tillatelse …"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Logg på"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Angi gyldig e-postadresse og passord."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Duplisert konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Du bruker allerede dette brukernavnet for kontoen <xliff:g id="DUPLICATE">%s</xliff:g>"</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Dette passordet begynner eller slutter med ett eller flere mellomromstegn. Mange tjenere støtter ikke passord med mellomrom."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Henter kontoinformasjon ..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Bekrefter tjenerinnstillingene ..."</string>
     <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 kanskje <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Konfigurering av konto"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Dette feltet må fylles ut."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Konfigurering av konto"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Kontotype"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Hvilken type konto er dette?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Konfigurering av konto"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Tjenerinnstillinger for innkommende e-post"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"BRUKERNAVN"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"PASSORD"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Når jeg sletter fra innboksen"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP-baneprefiks"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Valgfri"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Konfigurering av konto"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Tjenerinnstillinger for utgående e-post"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP-TJENER"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"SIKKERHETSTYPE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Krev pålogging"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"BRUKERNAVN"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"PASSORD"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"KLIENTSERTIFIKAT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Velg"</string>
     <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">"MOBILENHETS-ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Kontoinnstillinger"</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>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Alle"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Bruk standardinnstillingen for kontoen"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Brukernavnet eller passordet er feil."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Påloggingen mislyktes.\n<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problem med kontokonfigureringen"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Bekreft at brukernavn, passord og kontoinnstillingene er riktige."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Kan ikke koble til tjeneren på en sikker måte."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Fjernadministrasjon av sikkerhet"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Tjeneren <xliff:g id="SERVER">%s</xliff:g> krever at den kan kontrollere noen av sikkerhetsfunksjonene på Android-enheten utenfra. Vil du fullføre konfigureringen av kontoen?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Denne tjeneren krever sikkerhetsfunksjoner som Android-enheten din ikke støtter, for eksempel: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Du kan ikke endre brukernavnet for en konto. Hvis du vil legge til en konto med et annet brukernavn, trykker du på Legg til konto."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ADVARSEL: Hvis du deaktiverer e-postappens rett til å administrere enheten, slettes alle e-postkontoene som krever appen sammen med e-poster, kontakter, kalenderaktiviteter og andre data."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Sikkerhetsoppdatering"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> krever at du oppdaterer sikkerhetsinnstillingene."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Passord for skjermlås utløpt"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Dataene for <xliff:g id="ACCOUNT">%s</xliff:g> slettes fra enheten. Du kan gjenopprette dem ved å endre PIN-kode eller passord til skjermlåsen. Vil du endre det nå?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Vil du forkaste endringer som ikke er lagret?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Kunne ikke logge på"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Brukernavnet eller passordet til <xliff:g id="ACCOUNT">%s</xliff:g> er feil. Vil du oppdatere dette nå?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Påloggingen til <xliff:g id="ACCOUNT">%s</xliff:g> mislyktes. Tjeneren sa: <xliff:g id="REASON">%s</xliff:g> Vil du oppdatere brukernavnet og/eller passordet ditt?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Nedlasting av vedlegg"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Last ned vedlegg fra nye e-poster automatisk via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"E-postvarsler"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synkroniser kalenderaktivitet for denne kontoen"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synkroniser e-post"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synkr. e-poster for denne kontoen"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrer"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrer"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Velg ringetone"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Innstillinger for tjener"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Synkroniseringsalternativer"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Synkroniser denne mappen"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Alle e-postene lastes ned når du er tilkoblet"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Antall dager med e-post som skal synkroniseres"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Avsenderbilde"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Bare noen «Pluss»-kontoer tilbyr POP-tilgangen denne appen trenger for å koble til. Hvis du ikke klarer å logge på med riktig e-postadresse og passord, kan det være du ikke har en betalt «Pluss»-konto. Start nettleseren for å få tilgang til slike e-postkontoer."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Før du konfigurerer denne e-postkontoen, må du gå til nettstedet for T-Online og opprette et passord for e-posttilgang via POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Exchange"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Kan ikke opprette kontoen. Prøv på nytt."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-post"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Aktiverer tjenerspesifikke sikkerhetsinnstillinger"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Innstillinger"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Generelle innstillinger"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Bekreft før sletting"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Bekreft før sending"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Søk i e-post"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Ikke tillat bruk av enhetens kamera"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Krev enhetspassord"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Begrens gjenbruk av nylige passord"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Det høres bra ut!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Jeg skal lese dette senere og ta kontakt."</string>
     <string name="quick_4" msgid="216066940197616025">"Jeg foreslår at vi avtaler et møte for å diskutere dette."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Bakgrunnssynkronisering for denne kontoen er deaktivert under streifing."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Sender svaret ..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personlig (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personlig (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Ingen e-poster."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Mappevelger"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Velg tjenerens papirkurvmappe for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Velg tjenerens sendte elementer-mappe for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Laster inn mappelisten …"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Ingen tilgjengelige"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Innstillinger for mappesynkronisering"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
deleted file mode 100644
index 8c394eb..0000000
--- a/res/values-ne-rNP/strings.xml
+++ /dev/null
@@ -1,296 +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">"इमेल अनुलग्नकहरु पढ्नुहोस्"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"तपाईँको इमेल अनुलग्नकहरू पढ्न अनुप्रयोगलाई अनुमति दिन्छ।"</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"इमेल प्रदाता डेटा पहुँच गर्नुहोस्"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"अनुप्रयोगलाई तपाईँको इमेल डेटाबेस, साथै प्राप्त सन्देशहरू, पठाइएका सन्देशहरू, प्रयोगकर्तानामहरू, र पासवर्डहरू अनुमति दिन्छ।"</string>
-    <string name="app_name" msgid="2206468539066258195">"इमेल"</string>
-    <string name="debug_title" msgid="1337476992195531309">"डिबग"</string>
-    <string name="create_action" msgid="6575946089819721958">"नयाँ सिर्जना गर्नुहोस्"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"कुनै द्रूत प्रतिक्रिया छैन।"</string>
-    <string name="account_settings_action" msgid="589969653965674604">"खाता सेटिङ्स"</string>
-    <string name="status_network_error" msgid="526826323872477973">"जडान समस्या।"</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"सन्देश सार्नुहोस्"</item>
-    <item quantity="other" msgid="5083310421670206821">"सन्देशहरू सार्नुहोस्"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 खाताहरु मा सार्न समर्थन गर्दैन।"</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"सार्न सकिएन किनकि छनोट भएका भित्र एक भन्दा बढी खाताहरु छन्।"</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"ड्राफ्ट, आउटबक्स, र पठाइएका मेल सूचीमा रहेका सन्देशहरू सार्न सकिदैन।"</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"इनबक्स"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"आउटबक्स"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"ड्राफ्ट"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"रद्दीटोकरी"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"पठाइयो"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"रद्दी"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"ताराङ्कित"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"पढ्न बाँकी"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"इनबक्स"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"ताराङ्कित"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"ड्राफ्ट"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"आउटबक्स"</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>\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>
-    <string name="attachment_not_found" msgid="5219773045406833000">"संलग्नक डाउनलोड गर्न सकेन।"</string>
-    <string name="message_decode_error" msgid="91396461771444300">"सन्देश डिकोड गर्दा एउटा समस्या थियो।"</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"एक वा अधिक अनुलग्नक अग्रेषित गर्न सकिएन"</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"अनुलग्नक अग्रेषित गरिएन"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> साइनइन असफल भयो।"</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"साइन इन गर्न सकेन"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"खाता सेटअप"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"प्रमाणिकरण अनुरोध गर्दै"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"साइन इन गर्नुहोस्"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"प्रमाणीकरण गर्न असमर्थ"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"इमेल ठेगाना वा पासवर्ड गलत छन्"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"इमेल ठेगाना :"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"इमेल खाता"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"तपाईँ केवल केही चरणहरूमा आफ्नो खाता सेट अप गर्न सक्नुहुन्छ।"</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"इमेल ठेगाना"</string>
-    <string name="or_label" msgid="6408695162723653446">"अथवा"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google का साथ साइन इन गर्नुहोस्"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"पासवर्ड"</string>
-    <string name="password_hint" msgid="4226682910292828279">"पासवर्ड"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s सँग साइन इन गरिएको"</string>
-    <string name="authentication_label" msgid="914463525214987772">"प्रमाणीकरण"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"प्रमाणीकरण जोड्नुहोस्"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"प्रमाणीकरण हटाउनुहोस्"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"म्यानुअल सेटअप"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"एउटा मान्य इमेल ठेगाना र पासवर्ड टाइप गर्नुहोस्।"</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"खाता नक्कली"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"तपाईँको \" <xliff:g id="DUPLICATE">%s</xliff:g> \" खाताको लागि तपाईँले पहिल्यैबाट यस  प्रयोगकर्तानाम प्रयोग गरिरहनुभएको छ।"</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"यो पासवर्ड एक वा एक भन्दा अधिक स्थान पात्रहरूको साथ सुरु वा समाप्त हुन्छ। धेरै सर्भरहरू रिक्त स्थानको साथ पासवर्डको समर्थन गरिँदैन।"</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"खाताको जानकारी प्राप्त भइरहेछ..."</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"सर्भर सेटिङलाई प्रमाणित गरिँदै ..."</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"एसएमटीपी सेटिङ्स मान्य गरिँदै..."</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_names_title" msgid="8780121351085082269">"खाता सेटअप"</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>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"यस क्षेत्र खाली हुन सक्दैन"</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"खाता सेटअप"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"खाता प्रकार"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"यस खाता कुन प्रकारको हो?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"खाता सेटअप"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"आवक सर्भर सेटिङ्स"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"प्रयोगकर्ता नाम"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"पासवर्ड"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"पासवर्ड"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"सर्भर"</string>
-    <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">"एसएसएल / टीएलएस (सबै सर्टिफिकेटहरू स्वीकार गर्नुहोस्)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="5169133414545009342">"एसएसएल/टीएलएस"</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_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>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"खाता सेटअप"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"बाहिर जाने सर्भर सेटिङ्स"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP सर्भर:"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"पोर्ट:"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"सुरक्षा प्रकार"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"साइन इन आवश्यकता"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"प्रयोगकर्ता नाम"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"पासवर्ड"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"क्लाइन्ट सर्टिफिकेट"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"चयन गर्नुहोस्"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"क्लाइन्ट प्रमाणपत्र प्रयोग गर्नुहोस्"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"हटाउनुहोस्"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"कुनै पनि होइन"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"मोबाइल उपकरण ID"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"खाता सेटिङ्स"</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_push" msgid="5511415696925307797">"स्वचालित (पुश)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="8929785860545198867">"हरेक ५ मिनेट"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="8787901333816702849">"हरेक १० मिनेट"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"हरेक १५ मिनेट"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"हरेक ३० मिनेट"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"हरेक घण्टा"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"इमेल आउँदा मलाई सूचित गर्नुहोस्"</string>
-    <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">"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>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"अन्तिम दिन"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"अन्तिम तीन दिन"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"अन्तिम हप्ता"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"अन्तिम दुई हप्ता"</string>
-    <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_fmt" msgid="8811464534757505457">"लगइन विफल।\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"सुरक्षित सर्भर जडान गर्न सक्दैन। \n (<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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_tls_required" msgid="1902309158359287958">"टीएलएस आवश्यक तर सर्भर द्वारा समर्थित छैन।"</string>
-    <string name="account_setup_failed_auth_required" msgid="2684010997018901707">"प्रमाणीकरण तरीकाहरु सर्भर द्वारा समर्थित छैन।"</string>
-    <string name="account_setup_failed_security" msgid="1627240499907011040">"सुरक्षा त्रुटिको कारण सर्भरमा कनेक्शन खोल्न सकिएन।"</string>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"सर्भरसँग जडान खुल्न सकेन।"</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"तपाईँले गलत सर्भर ठेगाना टाइप गर्नुभयो वा सर्भरलाई एउटा प्रोटोकल संस्करणक आवश्यकता छ जुन इमेलले समर्थन गर्दैन।"</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"तपाईँलाई यस सर्भरसँग सिङ्क गर्ने अनुमति छैन। थप जानकारीको लागि आफ्नो सर्भरको व्यवस्थापकसँग सम्पर्क गर्नुहोला।"</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"टाढा सुरक्षा प्रशासन"</string>
-    <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"तपाईं खाताको प्रयोगकर्तानाम परिवर्तन गर्न सक्नुहुन्न। बिभिन्न प्रयोगकर्तानामको साथ खाता थप गर्न, खाता थप गर्नुहोस् भन्ने टच गर्नुहोला।"</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"चेतावनी: तपाईँको उपकरण इमेल अनुप्रयोगको अधिकार प्रबन्धकमा असक्षम गरिँदा तपाईँको उपकरणले यसलाई आवश्यक पर्ने सबै इमेल खाताहरू, साथै तिनीहरूको इमेल, सम्पर्कहरू, क्यालेन्डर कार्यक्रमहरू, र अन्य डेटा मेटाउने छ।"</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_change_title" msgid="615639963487448183">"सुरक्षा नीतिहरू परिवर्तित भयो"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"सुरक्षा नीतिहरु पूरा हुन सकेन"</string>
-    <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_content_title" msgid="4360288708739366810">"लक स्क्रिन पासवर्डको म्याद सकिँदैछ"</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_expired_dialog_title" msgid="7275534155170185252">"लक स्क्रिन पासवर्डको समयावधि सकियो"</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_login_dialog_title" msgid="2250911725501042470">"साइन इन गर्न सकेन"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> को लागि प्रयोगकर्ता नाम वा पासवर्ड गलत छ। के तपाइँ तिनीहरुलाई अद्यावधिक गर्न चाहनुहुन्छ?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"<xliff:g id="ACCOUNT">%s</xliff:g> मा तपाईँको लग इन विफल भयो, सर्भरले भन्यो: <xliff:g id="REASON">%s</xliff:g> के तपाइँ प्रयोगकर्ता नाम र/वा पासवर्डलाई अद्यावधिक गर्न चाहनुहुन्छ?"</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_notify_label" msgid="8621226576645167987">"इमेल सूचनाहरू"</string>
-    <string name="account_settings_summary" msgid="4733776978291376161">"सिंक फ्रिक्वेन्सी, अधिसूचनाहरू, आदि।"</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"इमेल आएको बेलामा सूचनाहरू पठाउनुहोस्"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"सिङ्क बाराम्बारता"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"आगमन सेटिङ"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"प्रयोगकर्ता नाम, पासवर्ड, र अन्य आगमन सर्भर सेटिङ"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"बाहिर जाने सेटिङ्स"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"प्रयोगकर्ता नाम, पासवर्ड, र अन्य बहिर्गमन सर्भर सेटिङहरु"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"नीतिहरू लागू गरियो"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"कुनै पनि होइन"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"असमर्थित नीतिहरू"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"कुनै पनि होइन"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"सिङ्क प्रयास गर्नुहोस्"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"यस  खातालाई सिङ्क गर्न को लागि यहाँ छुनुहोस्"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"खाता नाम"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"तपाईँको नाम"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"चाँडो जवाफ"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"इमेल रचना गर्दा तपाईँले प्रायः सम्मिलित गर्ने पाठ सम्पादन गर्नुहोस्"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"सूचना सेटिङहरू"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"डेटा उपयोग"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"सुरक्षा नीतिहरू"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"प्रणाली फोल्डर"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"रद्दीको फोल्डर"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"तपाईँको सर्भरको रद्दी फोल्डर छान्नुहोस्"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"तपाईँको सर्भरको रद्दी फोल्डर छान्नुहोस्"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"पठाइएको वस्तु फोल्डर"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"तपाईँको सर्भरको पठाइएको वस्तु फोल्डर छान्नुहोस्"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"तपाईँको सर्भरको पठाइएको वस्तु फोल्डर छान्नुहोस्"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"चाँडो जवाफ"</string>
-    <string name="save_action" msgid="5740359453077441466">"सुरक्षित गर्नुहोस्"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"सम्पर्क सिङ्क गर्नुहोस्"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"यस खाताको लागि सम्पर्कहरू सिंक गर्नुहोस्"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"पात्रो सिङ्क गर्नुहोस्"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"यस खाताको लागि क्यालेन्डर कार्यक्रम सिंक गर्नुहोस्"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"सिङ्क इमेल"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"यस खाताको लागि इमेल सिङ्क गर्नुहोस्"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"कम्पन गर्नुहोस्"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"रिङटोन छनौट गर्नुहोस्"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"सर्भर सेटिङ्स"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"सिङ्क विकल्पहरू"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"सिङ्क विकल्पहरु (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"यस फोल्डरलाई सिङ्क गर्नुहोस्"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"जडान हुँदा सन्देशहरू डाउनलोड हुने छन्"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"सिङ्क गर्नुपर्ने मेलका दिनहरू"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"प्रेषक चित्र"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"केवल केही \"प्लस\" खाताहरूले मात्र यस प्रोग्रामलाई जडान गर्न POP पहुँच समावेश गर्दछ। यदि तपाईँ आफ्नो सही इमेल ठेगाना र पासवर्डबाट साइन इन गर्न असक्षम हुनुभयो भने, तपाईँले \"प्लस\" खातामा भुक्तान नगरेको हुनुपर्दछ। यी इमेल खाताहरूमा पहुँच पाउनको लागि वेब ब्राउजर सुरुवात गर्नुहोस्।"</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"यो इमेल खाता सेट अप गर्नु अघि, टि-अनलाइन वेबसाइटको भ्रमण गर्नुहोस् र POP3 इमेल पहुँचको लागि एउटा पासवर्डको सिर्जना गर्नुहोस्।"</string>
-    <string name="exchange_name" msgid="3793803477985438102">"कर्पोरेट"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"खाता सिर्जना गर्न सकिँदैन। पुन:प्रयास गर्नुहोस्।"</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"इमेल"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"सर्भर-निर्दिष्ट सुरक्षा नीतिहरुलाई सक्षम बनाउँछ"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"सेटिङ्स"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"साधारण सेटिङहरू"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"मेट्नुभन्दा पहिले निश्चित गर्नुहोस्"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"पठाउनुअघि निश्चित गर्नुहोस्"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"९९९+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"इमेल खोजी गर्नुहोस्"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"उपकरणको क्यामेराको प्रयोग अस्वीकार गर्नुहोस्"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"उपकरण पासवर्डको आवश्यकता छ"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"हालका पासवर्डहरूको पुन: उपयोग प्रतिबन्धित गर्नुहोस्"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"समयावधिमा पासवर्डहरू आवश्यकता"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"यसको स्क्रिन लक गर्नको लागि एउटा निष्क्रिय उपकरणको आवश्यकता"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"सिङ्क भएका पात्रो घटनाहरुको संख्या सीमित गर्नुहोस्"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"सि‌ङ्क भएका इमेलहरूको संख्या सीमित गर्नुहोस्"</string>
-    <string name="quick_1" msgid="9130521670178673190">"धन्यवाद!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"मलाई राम्रो लाग्दछ!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"म यसलाई पछि पढ्ने छु र तपाइँकोमा फर्किनेछु।"</string>
-    <string name="quick_4" msgid="216066940197616025">"यस बारेमा छलफल गर्न एउटा बैठक सेट अप गरौं।"</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"रोमिङको क्रममा यस  खाताको लागि पृष्ठभूमि सिङ्क असक्षम छ।"</string>
-    <string name="confirm_response" msgid="6764021931370809514">"प्रतिक्रिया पठाउँदै..."</string>
-    <string name="no_conversations" msgid="3785854971159919343">"कुनै सन्देशहरू छैन।"</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"फोल्डर पिकर"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> को लागि सर्भर रद्दी फोल्डर चयन गर्नुहोस्"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g>को लागि सर्भर पठाइएका वस्तुहरू चयन गर्नुहोस्"</string>
-    <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>
-</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5644e8f..ab3d630 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Gegevens e-mailprovider openen"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Hiermee geeft u deze app toegang tot uw e-maildatabase, inclusief ontvangen berichten, verzonden berichten, gebruikersnamen en wachtwoorden."</string>
     <string name="app_name" msgid="2206468539066258195">"E-mail"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Foutopsporing"</string>
     <string name="create_action" msgid="6575946089819721958">"Nieuwe maken"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Geen snelle reacties."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Accountinstellingen"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Verbindingsprobleem."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Bericht verplaatsen"</item>
+    <item quantity="other" msgid="5083310421670206821">"Berichten verplaatsen"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Verplaatsen wordt niet ondersteund in POP3-accounts."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Verplaatsen is niet mogelijk. Selectie bevat meerdere accounts."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Berichten in de mappen \'Concepten\', \'Postvak UIT\' en \'Verzonden berichten\' kunnen niet worden verplaatst."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Postvak IN"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Postvak UIT"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Concepten"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Ongewenst"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Met ster"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Ongelezen"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Foutopsporing"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Postvak IN"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Met ster"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Concepten"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Postvak UIT"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Gecombineerde weergave"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Oorspronkelijk bericht --------\nOnderwerp: <xliff:g id="SUBJECT">%1$s</xliff:g>\nVan: <xliff:g id="SENDER">%2$s</xliff:g>\nAan: <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">"Snelle reactie invoegen"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Snelle reactie invoegen"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Een of meer bijlagen in uw doorgestuurde bericht worden gedownload voordat het bericht wordt verzonden."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Kan de bijlage niet downloaden."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Er is een fout opgetreden tijdens het decoderen van het bericht."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Kan een of meer bijlagen niet doorsturen."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Bijlage niet doorgestuurd"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>: aanmelden mislukt."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Kan niet inloggen"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Accountinstellingen"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Autorisatie aanvragen"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Inloggen"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Typ een geldig e-mailadres en wachtwoord."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Dubbel account"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"U gebruikt deze gebruikersnaam al voor het account \'<xliff:g id="DUPLICATE">%s</xliff:g>\'."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Dit wachtwoord begint of eindigt met een of meer spaties. Veel servers bieden geen ondersteuning voor wachtwoorden met spaties."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Accountinformatie ophalen..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Serverinstellingen verifiëren…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"SMTP-instellingen verifiëren…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Account maken…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Accounttype bevestigen"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"U heeft aangegeven dat <xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g> gebruikt, maar het account gebruikt mogelijk <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Accountinstellingen"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Uw account is ingesteld."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Geef dit account een naam (optioneel)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Uw naam (wordt weergegeven in uitgaande berichten)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Dit veld moet ingevuld worden"</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Accountinstellingen"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Accounttype"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Welk type account is dit?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Accountinstellingen"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Instellingen voor de inkomende server"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"GEBRUIKERSNAAM"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"WACHTWOORD"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Als ik verwijder uit mijn Postvak IN"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Voorvoegsel IMAP-pad"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Optioneel"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Accountinstellingen"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Instellingen voor de uitgaande server"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP-SERVER"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"POORT"</string>
     <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_outgoing_password_label" msgid="112570779839746136">"WACHTWOORD"</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>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Geen"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID MOBIEL APPARAAT"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Accountinstellingen"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Accountopties"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Synchronisatiefrequentie:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nooit"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Alles"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Accountstandaard gebruiken"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Gebruikersnaam of wachtwoord is onjuist."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Inloggen mislukt.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Probleem met instellen van account"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Controleer of de gebruikersnaam, het wachtwoord en de accountinstellingen correct zijn."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Kan geen veilige verbinding met de server tot stand brengen."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Extern beveiligingsbeheer"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"De server <xliff:g id="SERVER">%s</xliff:g> vereist dat u de server toestemming geeft bepaalde beveiligingsfuncties van uw Android-apparaat extern te bedienen. Wilt u het instellen van dit account voltooien?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Voor deze server zijn beveiligingsfuncties nodig die uw Android-apparaat niet ondersteunt, waaronder: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"U kunt de gebruikersnaam van een account niet wijzigen. Als u een account met een andere gebruikersnaam wilt toevoegen, raakt u \'Account toevoegen\' aan."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"WAARSCHUWING: als u de rechten van de app E-mail voor het beheren van uw apparaat uitschakelt, worden alle e-mailaccounts verwijderd waarvoor deze rechten vereist zijn, samen met de bijbehorende e-mails, contacten, agenda-afspraken en andere gegevens."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Beveiligingsupdate"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"Voor <xliff:g id="ACCOUNT">%s</xliff:g> moet u uw beveiligingsinstellingen bijwerken."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Wachtwoord schermvergrendeling verlopen"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"De gegevens voor <xliff:g id="ACCOUNT">%s</xliff:g> worden gewist op uw apparaat. U kunt het account herstellen door uw pincode of wachtwoord voor schermvergrendeling te wijzigen. Nu wijzigen?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Niet-opgeslagen wijzigingen annuleren?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Kan niet inloggen"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"De gebruikersnaam of het wachtwoord voor <xliff:g id="ACCOUNT">%s</xliff:g> is onjuist. Wilt u deze nu bijwerken?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Inloggen bij <xliff:g id="ACCOUNT">%s</xliff:g> is mislukt. De server retourneerde het volgende bericht: <xliff:g id="REASON">%s</xliff:g> Wilt u uw gebruikersnaam en/of wachtwoord bijwerken?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Bijlagen downloaden"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Bijlagen van recente berichten automatisch downloaden via wifi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Meldingen via e-mail"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Agenda-afspraak voor dit account synchroniseren"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"E-mail synchroniseren"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"E-mail voor dit account synchroniseren"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Trillen"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Trillen"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Beltoon kiezen"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Serverinstellingen"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Synchronisatieopties"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Deze map synchroniseren"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Berichten worden gedownload wanneer verbinding is gemaakt"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Dagen waarvoor e-mail wordt gesynchroniseerd"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Afbeelding van afzender"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Alleen sommige Plus-accounts hebben POP-toegang waarmee dit programma verbinding kan maken. Als u niet kunt inloggen met het juiste e-mailadres en wachtwoord, heeft u mogelijk niet betaald voor uw Plus-account. Start de webbrowser voor toegang tot deze e-mailaccounts."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Voordat u dit e-mailaccount instelt, gaat u naar de website van T-Online en maakt u een wachtwoord voor toegang tot e-mail via POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Zakelijk"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Kan het account niet maken. Probeer het opnieuw."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-mail"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Door de server aangegeven beveiligingsbeleid inschakelen"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Instellingen"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Algemene instellingen"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Bevestigen vóór verwijderen"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Bevestigen vóór verzenden"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Zoeken in e-mail"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Gebruik van apparaatcamera niet toestaan"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Apparaatwachtwoord vereisen"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Hergebruik recente wachtwoorden beperken"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Dat lijkt me prima."</string>
     <string name="quick_3" msgid="8070999183033184986">"Ik zal dit later lezen en kom er dan op terug."</string>
     <string name="quick_4" msgid="216066940197616025">"Laten we een afspraak maken om dit te bespreken."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Achtergrondsynchronisatie voor dit account is uitgeschakeld tijdens roaming."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Reactie verzenden…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Persoonlijk (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Persoonlijk (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Geen berichten."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Mapkiezer"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Prullenbak van server selecteren voor <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Map \'Verzonden items\' van server selecteren voor <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Mappenlijst laden…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Geen beschikbaar"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Instellingen voor mapsynchronisatie"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d58c71d..a923c1b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -21,11 +21,12 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Dostęp do danych dostawcy poczty e-mail"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Zezwala aplikacji na dostęp do bazy danych e-maili, w tym odebranych i wysłanych wiadomości, nazw użytkowników oraz haseł."</string>
     <string name="app_name" msgid="2206468539066258195">"Poczta"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Debuguj"</string>
     <string name="create_action" msgid="6575946089819721958">"Utwórz nową"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Brak szybkich odpowiedzi"</string>
     <string name="account_settings_action" msgid="589969653965674604">"Ustawienia konta"</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Odebrane"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Skrzynka nadawcza"</string>
+    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Do wysłania"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Kopie robocze"</string>
     <string name="mailbox_name_display_trash" msgid="7020792045007681852">"Kosz"</string>
     <string name="mailbox_name_display_sent" msgid="6705058612006729985">"Wysłane"</string>
@@ -38,11 +39,28 @@
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Wstaw szybką odpowiedź"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Wstaw szybką odpowiedź"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Co najmniej jeden załącznik w przekazywanej wiadomości zostanie pobrany przed wysłaniem."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Nie można pobrać załącznika."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Podczas dekodowania wiadomości wystąpił błąd."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Co najmniej jednego załącznika nie można przekazać dalej."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Nie przekazano załącznika"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Nie udało się zalogować na konto <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Nie można się zalogować"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Konfiguracja konta"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Proszę o autoryzację"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Zaloguj się"</string>
@@ -64,17 +82,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Wpisz prawidłowy adres e-mail i hasło."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Zduplikowane konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Używasz już tej nazwy użytkownika na koncie „<xliff:g id="DUPLICATE">%s</xliff:g>”."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Hasło zaczyna się lub kończy co najmniej jedną spacją. Wiele serwerów nie obsługuje haseł ze spacjami."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Pobieranie informacji o koncie…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Sprawdzam ustawienia serwera…"</string>
     <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_names_title" msgid="8780121351085082269">"Konfiguracja konta"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"To pole nie może być puste."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Konfiguracja konta"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Typ konta"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Jakiego typu jest to konto?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Konfiguracja konta"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Ustawienia serwera poczty przychodzącej"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NAZWA UŻYTKOWNIKA"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"HASŁO"</string>
@@ -92,18 +115,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Po usunięciu z folderu Odebrane"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Prefiks ścieżki IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Opcjonalnie"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Konfiguracja konta"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Ustawienia serwera poczty wychodzącej"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERWER SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TYP ZABEZPIECZEŃ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Wymagaj logowania"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NAZWA UŻYTKOWNIKA"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"HASŁO"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTYFIKAT KLIENTA"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Wybierz"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Użyj certyfikatu klienta"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Usuń"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Brak"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID URZĄDZENIA MOBILNEGO"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Ustawienia konta"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Opcje konta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Częstotliwość synchronizacji:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nigdy"</string>
@@ -129,6 +155,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Wszystkie"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Użyj wartości domyślnej konta"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Nieprawidłowa nazwa użytkownika lub hasło"</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Nie udało się zalogować.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problem z konfiguracją konta"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Potwierdź poprawność nazwy użytkownika, hasła i ustawień konta."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Nie można bezpiecznie połączyć się z serwerem."</string>
@@ -147,6 +174,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Zdalne administrowanie zabezpieczeniami"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Serwer <xliff:g id="SERVER">%s</xliff:g> wymaga udzielenia zezwolenia na zdalną kontrolę niektórych funkcji zabezpieczeń tego urządzenia z systemem Android. Czy chcesz zakończyć konfigurowanie tego konta?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Serwer wymaga funkcji zabezpieczeń, których to urządzenie z Androidem nie obsługuje, w tym: <xliff:g id="ERROR">%s</xliff:g>."</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Nie można zmienić nazwy użytkownika konta. Aby dodać konto z inną nazwą użytkownika, kliknij Dodaj konto."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"OSTRZEŻENIE: cofnięcie Poczcie uprawnień do administrowania urządzeniem spowoduje usunięcie wszystkich kont e-mail, które ich wymagają, wraz z wiadomościami, kontaktami, wydarzeniami w kalendarzu i innymi danymi."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Aktualizacja zabezpieczeń"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> wymaga aktualizacji ustawień zabezpieczeń."</string>
@@ -168,6 +196,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Hasło ekranu blokady wygasło"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Trwa wymazywanie z urządzenia danych konta <xliff:g id="ACCOUNT">%s</xliff:g>. Można je przywrócić, zmieniając PIN lub hasło ekranu blokady. Zmienić je teraz?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Odrzucić niezapisane zmiany?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Nie można się zalogować"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Nazwa użytkownika lub hasło dla konta <xliff:g id="ACCOUNT">%s</xliff:g> są nieprawidłowe. Chcesz je poprawić?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Błąd logowania się na <xliff:g id="ACCOUNT">%s</xliff:g>. Odpowiedź serwera: <xliff:g id="REASON">%s</xliff:g> Czy chcesz zaktualizować nazwę użytkownika i/lub hasło?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Pobieraj załączniki"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Automatycznie pobieraj załączniki najnowszych wiadomości przez Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Powiadomienia e-mail"</string>
@@ -206,7 +237,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synchronizuj kalendarz dla tego konta"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synchronizuj e-maile"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synchronizuj wiadomości e-mail dla tego konta"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Wibracje"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Wibracje"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Wybierz dzwonek"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Ustawienia serwera"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opcje synchronizacji"</string>
@@ -214,11 +245,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Zsynchronizuj ten folder"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Wiadomości zostaną pobrane po nawiązaniu połączenia"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Okres do synchronizacji"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Zdjęcie nadawcy"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Tylko niektóre konta typu „Plus” zawierają funkcję dostępu POP umożliwiającą łączenie się za pomocą tego programu. Jeśli nie możesz zalogować się przy użyciu poprawnego adresu e-mail i hasła, być może nie masz płatnego konta typu „Plus”. Uruchom przeglądarkę, aby uzyskać dostęp do tych kont e-mail."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Przed skonfigurowaniem tego konta e-mail odwiedź witrynę T-Online i utwórz hasło dostępu do poczty POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Firma"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Nie można utworzyć konta. Spróbuj ponownie."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-mail"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Włącza zasady zabezpieczeń określone na serwerze"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Ustawienia"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Ustawienia ogólne"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Potwierdź usuwanie"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Potwierdź wysyłanie"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Wyszukaj w e-mailach"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Nie zezwalaj na używanie aparatu"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Wymagaj hasła do urządzenia"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Nie zezwalaj na używanie poprzednich haseł"</string>
@@ -230,13 +270,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Brzmi dobrze."</string>
     <string name="quick_3" msgid="8070999183033184986">"Przeczytam później i skontaktuję się."</string>
     <string name="quick_4" msgid="216066940197616025">"Spotkajmy się, aby to omówić."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Synchronizacja w tle z tym kontem jest podczas roamingu wyłączona."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Wysyłam odpowiedź…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Osobiste (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Osobiste (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Brak wiadomości."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Selektor folderów"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Wybierz folder kosza na serwerze dla: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Wybierz folder elementów wysłanych na serwerze dla: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Wczytuję listę folderów…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Brak dostępnych"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Ustawienia synchronizacji folderu"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e8da4a7..ce5625f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Aceder a dados do fornecedor de email"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Permite que a aplicação aceda à base de dados do email, incluindo às mensagens recebidas, mensagens enviadas, nomes de utilizadores e palavras-passe."</string>
     <string name="app_name" msgid="2206468539066258195">"Email"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Depuração"</string>
     <string name="create_action" msgid="6575946089819721958">"Criar nova"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Sem respostas rápidas."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Definições da conta"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Problema de ligação."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Mover mensagem"</item>
+    <item quantity="other" msgid="5083310421670206821">"Mover mensagens"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Não é possível mover em contas POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Não é possível mover porque a seleção contém várias contas."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Não é possível mover as mensagens em Rascunhos, Caixa de Saída e Enviadas."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Caixa de Entrada"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Caixa de saída"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Rascunhos"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Correio electrónico não solicitado"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Com estrela"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Não lidas"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Depuração"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Caixa de Entrada"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Marcado com estrela"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Rascunhos"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Caixa de saída"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Vista combinada"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Mensagem original --------\nAssunto: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe: <xliff:g id="SENDER">%2$s</xliff:g>\nPara: <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">"Inserir resposta rápida"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Inserir resposta rápida"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Um ou mais anexos da mensagem que encaminhou serão transferidos antes do envio."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Não foi possível transferir o anexo."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Ocorreu um erro durante a descodificação da mensagem."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Não foi possível encaminhar um ou mais anexos."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"O anexo não foi encaminhado"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Início de sessão de <xliff:g id="ACCOUNT_NAME">%s</xliff:g> sem êxito."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Impossível iniciar sessão"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Configuração da conta"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"A solicitar autorização"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Iniciar sessão"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Introduza um endereço de email e palavra-passe válidos."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Conta duplicada"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Este nome de utilizador já está a ser utilizado para a conta “<xliff:g id="DUPLICATE">%s</xliff:g>”."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Esta palavra-passe começa ou termina com um ou mais caracteres de espaço. Muitos servidores não suportam palavras-passe com espaços."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"A obter informações da conta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"A validar as definições do servidor..."</string>
     <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 <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Configuração da conta"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Este campo não pode estar em branco."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Configuração da conta"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Tipo de conta"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Que tipo de conta é esta?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Configuração da conta"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Definições do servidor de receção"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NOME DE UTILIZADOR"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"PALAVRA-PASSE"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Quando elimino da pasta A Receber"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Prefixo de caminho IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Opcional"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Configuração da conta"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Definições de servidor de envio"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVIDOR SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORTA"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TIPO DE SEGURANÇA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Requerer início de sessão"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NOME DO UTILIZADOR"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"PALAVRA-PASSE"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFICADO CLIENTE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Selecionar"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Utilizar certificado de cliente"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Remover"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Nenhum"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID DO DISPOSITIVO MÓVEL"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Definições da conta"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Opções da conta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Frequência de sincronização:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nunca"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Todas"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Utilizar predef. conta"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"O nome de utilizador ou a palavra-passe estão incorretos."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"O início de sessão falhou. \n (<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problema na configuração da conta"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Confirme se o nome de utilizador, a palavra-passe e as definições da conta estão corretos."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Não é possível ligar ao servidor em segurança."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Administração de segurança remota"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"O servidor <xliff:g id="SERVER">%s</xliff:g> requer permissão para controlar remotamente algumas das funcionalidades de segurança do dispositivo Android. Pretende concluir a configuração desta conta?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Este servidor requer funcionalidades de segurança que o seu aparelho Android não suporta, incluindo: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Não é possível alterar o nome de utilizador de uma conta. Para adicionar uma conta com outro nome de utilizador, toque em Adicionar conta."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"AVISO: a desativação da autorização da aplicação Email para administrar o aparelho eliminará todas as contas de email que necessitam desta, juntamente com o respetivo email, contactos, eventos de agenda e outros dados."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Atualização de segurança"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> requer a atualização das definições de segurança."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"A palavra-passe de bloq. do ecrã expirou"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Os dados de <xliff:g id="ACCOUNT">%s</xliff:g> estão a ser apagados do dispositivo. Pode restaurá-los alterando o PIN ou a palavra-passe de bloqueio do ecrã. Pretende alterar agora?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Rejeitar alterações não guardadas?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Não foi possível iniciar sessão."</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"O nome de utilizador ou a palavra-passe para <xliff:g id="ACCOUNT">%s</xliff:g> estão incorretos. Pretende atualizá-los agora?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"O seu início de sessão para <xliff:g id="ACCOUNT">%s</xliff:g> falhou; o servidor perguntou: <xliff:g id="REASON">%s</xliff:g> Pretende atualizar o seu nome de utilizador e/ou palavra-passe?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Transferir anexos"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Transferir automaticamente anexos de mensagens recentes p/ Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Notificações de email"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinc. evento do cal. p. esta conta"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronizar email"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronizar email para esta conta"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrar"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Escolher toque"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Definições do servidor"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opções de sincronização"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sincronizar esta pasta"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"As mensagens serão transferidas quando tiver ligação à Internet"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Dias de correio a sincronizar"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Imagem do remetente"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Apenas algumas contas “Plus” incluem acesso POP, permitindo a ligação deste programa. Se não conseguir iniciar sessão com o endereço de email e palavra-passe corretos, é possível que não tenha uma conta “Plus” paga. Inicie o navegador de Internet para obter acesso a essas contas de email."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Antes de configurar esta conta de email, visite o Web site T-Online e crie uma palavra-passe de acesso a e-mail POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Empresa"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Não foi possível criar a conta. Tente novamente."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Email"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Activa as políticas de segurança especificadas pelo servidor"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Configurações"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Definições gerais"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Confirmar antes de eliminar"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Confirmar antes de enviar"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Pesquisar email"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Não perm. utilização câmara do aparelho"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Solicitar palavra-passe do aparelho"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Limitar reutilização pal.-passe recentes"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Parece-me bem!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Vou ler isto mais tarde e voltarei a contactá-lo."</string>
     <string name="quick_4" msgid="216066940197616025">"Vamos marcar uma reunião para discutir isso."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"A sincronização em segundo plano desta conta está desativada quando está em roaming."</string>
     <string name="confirm_response" msgid="6764021931370809514">"A enviar resposta..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Pessoal (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Pessoal (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Não tem mensagens."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Seletor de pastas"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Selecionar a pasta de lixo do servidor para <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Selecionar a pasta de itens enviados do servidor para <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"A carregar a lista de pastas..."</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Nenhuma disponível"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Definições de sincronização da pasta"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2fb871c..d7ab8dc 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -17,13 +17,22 @@
 <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">"Ler os anexos do e-mail"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"Permite que o app leia seus anexos de e-mail."</string>
+    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"Permite que o aplicativo leia seus anexos de e-mail."</string>
     <string name="permission_access_provider_label" msgid="977700184037298723">"Acessar dados do provedor de e-mail"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"Permite que o app acesse o banco de dados de seu e-mail, incluindo mensagens recebidas e enviadas, nomes de usuário e senhas."</string>
+    <string name="permission_access_provider_desc" msgid="5338433949655493713">"Permite que o aplicativo acesse o banco de dados de seu e-mail, incluindo mensagens recebidas e enviadas, nomes de usuário e senhas."</string>
     <string name="app_name" msgid="2206468539066258195">"E-mail"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Depurar"</string>
     <string name="create_action" msgid="6575946089819721958">"Criar nova"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Nenhuma resposta rápida."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Configurações da conta"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Problema na conexão."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Mover mensagem"</item>
+    <item quantity="other" msgid="5083310421670206821">"Mover mensagens"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"A ação Mover não é suportada em contas POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Não é possível mover porque a seleção contém várias contas."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"As mensagens em Rascunhos, na Caixa de saída e em Enviados não podem ser movidas."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Caixa de entrada"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Caixa de saída"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Rascunhos"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Lixo"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Com estrela"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Não lido"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Depurar"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Caixa de entrada"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Com estrela"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Rascunhos"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Caixa de saída"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Visualização combinada"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Mensagem Original --------\nAssunto: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe: <xliff:g id="SENDER">%2$s</xliff:g>\nPara: <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">"Inserir resposta rápida"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Inserir resposta rápida"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Um ou mais anexos de sua mensagem encaminhada serão transferidos antes do envio."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Não foi possível fazer download do anexo."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Ocorreu um erro ao decodificar a mensagem."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Não foi possível encaminhar todos os anexos."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Anexo não encaminhado"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Falha no login de <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Não foi possível fazer login"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> Kb"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> Kb"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Configuração da conta"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Solicitando autorização"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Fazer login"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Digite um endereço de e-mail e senha válidos."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Conta duplicada"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Você já está usando este nome de usuário para a conta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Essa senha inicia ou termina com um ou mais caracteres de espaço. Muitos servidores não suportam senhas com espaços."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Recuperando informações sobre a conta"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Validando as configurações do servidor..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Validando as configurações de SMTP..."</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Criando conta..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Confirme o tipo de conta"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Você indicou que <xliff:g id="EMAIL">%1$s</xliff:g> usa <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, mas a conta pode usar <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Configuração da conta"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Sua conta está configurada e o e-mail está a caminho!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Dar nome a esta conta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Seu nome (exibido nas mensagens enviadas)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Este campo não pode ficar em branco."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Configuração da conta"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Tipo de conta"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Que tipo de conta é esta?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Configuração da conta"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Configurações de entrada do servidor"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NOME DE USUÁRIO"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"SENHA"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Quando eu excluir da Caixa de entrada"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Prefixo do caminho IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Opcional"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Configuração da conta"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Configurações de saída do servidor"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVIDOR SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORTA"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TIPO DE SEGURANÇA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Exigir login"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NOME DE USUÁRIO"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"SENHA"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFICADO DO CLIENTE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Selecionar"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Usar certificado de cliente"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Remover"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Nenhum"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID DO DISPOSITIVO MÓVEL"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Configurações da conta"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Opções da conta"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Frequência de sincronização:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nunca"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Todos"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Usar padrão da conta"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Nome de usuário ou senha incorretos."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Falha no login.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problema com a configuração da conta"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Verifique se o nome de usuário, a senha e as configurações da conta estão corretos."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Não é possível se conectar ao servidor com segurança."</string>
@@ -168,6 +206,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Senha da tela de bloqueio expirada"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Os dados da <xliff:g id="ACCOUNT">%s</xliff:g> estão sendo apagados de seu dispositivo. Você pode restaurá-los alterando o PIN ou a senha de sua tela de bloqueio. Deseja mudar isso agora?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Descartar as alterações não salvas?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Não foi possível fazer login"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"O nome de usuário ou senha da <xliff:g id="ACCOUNT">%s</xliff:g> está incorreto. Deseja atualizar agora?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"O login em <xliff:g id="ACCOUNT">%s</xliff:g> falhou. Mensagem do servidor: <xliff:g id="REASON">%s</xliff:g> Deseja atualizar seu nome de usuário e/ou sua senha?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Fazer download dos anexos"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Fazer download automát. dos anexos de mens. recentes via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Notificações de e-mail"</string>
@@ -206,7 +247,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinc. evento agenda p/ esta conta"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronizar e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronizar e-mail para esta conta"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrar"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Selecionar toque"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Configurações do servidor"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opções de sincronização"</string>
@@ -214,11 +255,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sincronizar esta pasta"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"O download das mensagens será feito quando você estiver conectado"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Dias de e-mails para sincronizar"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Imagem do remetente"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Somente algumas contas \"Plus\" incluem o acesso POP permitindo que este programa seja conectado. Se não for possível fazer login com seu endereço de e-mail e senha corretos, você talvez não tenha uma conta \"Plus\" paga. Inicie o navegador da web para acessar essas contas de e-mail."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Antes de configurar essa conta de e-mail, acesse o site T-Online e crie uma senha para acessar e-mail POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Corporativa"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Não foi possível criar a conta. Tente novamente."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-mail"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Ativa as políticas de segurança especificadas pelo servidor"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Configurações"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Configurações gerais"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Confirmar antes de excluir"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Confirmar antes de enviar"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Pesquisar e-mail"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Desativar o uso da câmera do dispositivo"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Exigir senha para o dispositivo"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Restringir reutiliz. de senhas recentes"</string>
@@ -230,13 +280,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Parece uma boa ideia!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Lerei isso mais tarde e darei uma resposta a você."</string>
     <string name="quick_4" msgid="216066940197616025">"Podemos marcar uma reunião para discutir isso."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"A sincronização em segundo plano para essa conta é desativada durante o roaming."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Enviando resposta..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Pessoal (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Pessoal (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Nenhuma mensagem."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Seletor de pasta"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Pasta Lixeira do servidor p/ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Pasta Enviados do servidor p/ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Carregando a lista de pastas..."</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Nenhuma disponível"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Configurações de sincronização de pastas"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f564416..d24310d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Accesaţi datele furnizorului de e-mail"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Permite aplicaţiei să acceseze baza de date a adresei de e-mail, incluzând mesajele primite, mesajele trimise, numele de utilizator şi parolele."</string>
     <string name="app_name" msgid="2206468539066258195">"E-mail"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Remediaţi erorile"</string>
     <string name="create_action" msgid="6575946089819721958">"Creaţi unul nou"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Nu există răspunsuri rapide."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Setările contului"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Problemă de conexiune."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Mutaţi mesajul"</item>
+    <item quantity="other" msgid="5083310421670206821">"Mutaţi mesajele"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Mutarea nu este acceptată pentru conturile de tip POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Nu se poate muta, deoarece selecţia conţine mai multe conturi."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Mesajele din Mesaje nefinalizate, Mesaje de trimis şi Mesaje trimise nu pot fi mutate."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Mesaje primite"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Mesaje de trimis"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Mesaje nefinalizate"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Mesaje nedorite"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Cu stea"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Necitite"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Remediaţi erorile"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Mesaje primite"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Cu stea"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Mesaje nefinalizate"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Mesaje de trimis"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Afişare combinată"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Mesajul original --------\nSubiect: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe la: <xliff:g id="SENDER">%2$s</xliff:g>\nCătre: <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">"Introduceţi un răspuns rapid"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Introduceți un răspuns rapid"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Unul sau mai multe ataşamente din mesajul dvs. redirecţionat vor fi descărcate înainte de a fi trimise."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Ataşamentul nu s-a putut descărca."</string>
     <string name="message_decode_error" msgid="91396461771444300">"A apărut o eroare la decodificarea mesajului."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Nu se pot redirecţiona unul sau mai multe ataşamente."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Ataşamentul nu a fost trimis"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Conectare eşuată pentru <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Nu s-a putut conecta"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KO"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KO"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MO"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MO"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GO"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GO"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Configurare cont"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Se solicită autorizarea"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Conectați-vă"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Introduceţi o adresă de e-mail şi o parolă valide."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Cont duplicat"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Utilizaţi deja acest nume de utilizator pentru contul „<xliff:g id="DUPLICATE">%s</xliff:g>”."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Această parolă începe sau se termină cu unul sau mai multe spaţii. Numeroase servere nu acceptă parole cu spaţii."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Se preiau informaţiile despre cont..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Se validează setările serverului..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Se validează setările SMTP..."</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Se creează contul…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Confirmați tipul de cont"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Ați indicat că <xliff:g id="EMAIL">%1$s</xliff:g> utilizează <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, dar contul ar putea utiliza <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Configurare cont"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Contul este configurat, iar e-mailul funcţionează corect!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Daţi un nume acestui cont (opţional)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Numele dvs. (afişat în mesajele de trimitere)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Acest câmp nu poate rămâne necompletat."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Configurare cont"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Tipul contului"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Ce tip de cont este acesta?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Configurare cont"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Setări pentru serverul de mesaje de intrare"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"NUME DE UTILIZATOR"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"PAROLĂ"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Când şterg un mesaj din Mesaje primite"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Prefixul de cale pentru accesul IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Opţional"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Configurare cont"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Setări pentru serverul de mesaje de ieşire"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVER SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TIP DE SECURITATE"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Necesită conectare"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"NUME DE UTILIZATOR"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"PAROLĂ"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFICAT CLIENT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Selectaţi"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Utilizaţi certificatul de client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Eliminaţi"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Niciunul"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID DISPOZITIV MOBIL"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Setări cont"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Opţiunile contului"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Frecvența de sincronizare:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Niciodată"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Toate"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Folosiți setarea standard"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Numele de utilizator sau parola sunt incorecte."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Conectarea a eşuat.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problemă la configurarea contului"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Verificați dacă numele de utilizator, parola și setările contului sunt corecte."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Nu se poate conecta în siguranţă la server."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Administrarea securităţii de la distanţă"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Serverul <xliff:g id="SERVER">%s</xliff:g> vă solicită permisiunea de a controla de la distanţă unele funcţii de securitate ale dispozitivului Android. Doriţi să finalizaţi configurarea acestui cont?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Pentru acest server sunt necesare funcţii de securitate pe care dispozitivul dvs. Android nu le acceptă, inclusiv: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Nu puteți schimba numele de utilizator al unui cont. Pentru a adăuga un cont cu alt nume de utilizator, atingeți Adăugați un cont."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"AVERTISMENT: dacă dezactivaţi autoritatea aplicaţiei E-mail de administrare a dispozitivului dvs. se şterg toate conturile de e-mail care au nevoie de aceasta, împreună cu e-mailurile, agenda, evenimentele din calendar şi alte date pe care aceste conturi le conţin."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Actualizare de securitate"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> vă solicită actualizarea setărilor dvs. de securitate."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Parola de blocare ecran expirată"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Datele pentru <xliff:g id="ACCOUNT">%s</xliff:g> sunt şterse de pe dispozitiv, dar le puteţi restabili modificând codul PIN sau parola de blocare a ecranului. Modificaţi acum?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Renunţaţi la modificările nesalvate?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Nu s-a putut conecta"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Numele de utilizator sau parola pentru <xliff:g id="ACCOUNT">%s</xliff:g> sunt incorecte. Doriţi să le actualizaţi acum?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Conectarea dvs. la <xliff:g id="ACCOUNT">%s</xliff:g> a eşuat; motivul invocat de server a fost: <xliff:g id="REASON">%s</xliff:g> Doriţi să actualizaţi numele de utilizator şi/sau parola?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Descărcaţi ataşamentele"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Descarcă automat prin Wi-Fi ataşam. mesaj. recente"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Notificările de e-mail"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sincron. evenim. calendar pt. cont"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincroniz. e-mailul"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincron. e-mail pt. acest cont"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrații"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrare"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Alegeţi un ton de sonerie"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Setări server"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opţiuni de sincronizare"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sincronizați acest dosar"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Mesajele vor fi descărcate la conectare"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Sincronizează începând cu"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Imaginea expeditorului"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Numai unele conturi de tip „Plus” includ accesul de tip POP, permiţând conectarea acestui program. Dacă nu reuşiţi să vă conectaţi cu adresa de e-mail şi parola corecte, este posibil să nu aveţi un cont de tip „Plus” plătit. Lansaţi browserul web pentru a obţine accesul la aceste conturi de e-mail."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Înainte de configurarea acestui cont de e-mail, accesaţi site-ul web T-Online şi creaţi o parolă pentru accesul la serviciile de e-mail POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Corporaţie"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Contul nu a putut fi creat. Încercaţi din nou."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-mail"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Activează politicile de securitate specificate pentru server"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Setări"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Setări generale"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Confirmaţi înainte de a şterge"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Confirmaţi înainte de a trimite"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Căutaţi în e-mail"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Nu permiteţi utilizarea camerei foto"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Solicitaţi parola dispozitivului"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Limitaţi reutilizarea parolelor recente"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Sună bine!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Voi citi mai târziu acest mesaj şi vă voi contacta."</string>
     <string name="quick_4" msgid="216066940197616025">"Să stabilim o întâlnire pentru a discuta."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Sincronizarea în fundal pentru acest cont este dezactivată în roaming."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Se trimite răspunsul…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personal (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personal (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Niciun mesaj."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Selector dosare"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Dosarul coş de gunoi pentru <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Dosar articole trimise pentru <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Se încarcă lista cu dosare…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Niciunul disponibil"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Setări pentru sincronizarea dosarului"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3ce754b..ff15353 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Доступ к данным сервиса эл. почты"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Приложение получит доступ к базе данных электронной почты, которая содержит полученные и отправленные сообщения, имена пользователей и пароли."</string>
     <string name="app_name" msgid="2206468539066258195">"Email"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Выполнить отладку"</string>
     <string name="create_action" msgid="6575946089819721958">"Создать"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Нет шаблонов"</string>
     <string name="account_settings_action" msgid="589969653965674604">"Настройки аккаунта"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Ошибка подключения."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Переместить сообщение"</item>
+    <item quantity="other" msgid="5083310421670206821">"Переместить сообщения"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Перемещение не поддерживается в аккаунтах POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Не удалось переместить сообщения, так как они находятся в разных аккаунтах."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Нельзя перемещать сообщения из папок \"Черновики\", \"Исходящие\" и \"Отправленные\"."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Входящие"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Исходящие"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Черновики"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Спам"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Помеченнные"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Непрочитанные"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Выполнить отладку"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Входящие"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Помеченные"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Черновики"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Исходящие"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Не удалось загрузить файл."</string>
     <string name="message_decode_error" msgid="91396461771444300">"При расшифровке сообщения произошла ошибка."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Сбой при пересылке прикрепленных файлов."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Не удалось переслать вложение"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Ошибка при входе в аккаунт <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Вход не выполнен"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> КБ"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> КБ"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> МБ"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> МБ"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ГБ"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ГБ"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Настройка аккаунта"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Запрос авторизации"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Вход в аккаунт"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Введите действительный адрес электронной почты и пароль."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Копировать аккаунт"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Это имя уже используется в аккаунте \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Пароль начинается или заканчивается пробелом. Некоторые серверы не поддерживают пароли с пробелами."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Получение информации аккаунта..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Проверка настроек сервера…"</string>
     <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="PROVIDERPROTOCOL">%3$s</xliff:g>, а не <xliff:g id="USERPROTOCOL">%2$s</xliff:g>."</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Настройка аккаунта"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Это поле должно быть заполнено."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Настройка аккаунта"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Тип аккаунта"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Выберите тип аккаунта"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Настройка аккаунта"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Настройки сервера входящей почты"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ИМЯ ПОЛЬЗОВАТЕЛЯ"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ПАРОЛЬ"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Настройка аккаунта"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Настройки сервера исходящих сообщений"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP-СЕРВЕР"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ПОРТ"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ТИП ЗАЩИТЫ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Выполнять вход в систему"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ИМЯ ПОЛЬЗОВАТЕЛЯ"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ПАРОЛЬ"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"СЕРТИФИКАТ КЛИЕНТА"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Выбрать"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Использовать сертификат клиента"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Удалить"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Не используется"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ИДЕНТИФИКАТОР МОБ. УСТРОЙСТВА"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Настройки аккаунта"</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>
@@ -113,11 +150,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"Каждые 15 минут"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"Каждые 30 минут"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"Каждый час"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"Оповещать о новых письмах"</string>
+    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"Уведомлять о новых письмах"</string>
     <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">"Скачивать прикрепленные файлы при наличии Wi-Fi-подключения"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"Не удалось войти.\nОшибка: <xliff:g id="ERROR">%s</xliff:g>"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Удаленное управление безопасностью"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"Невозможно изменить имя пользователя. Если хотите использовать другое имя, нажмите \"Добавить аккаунт\"."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ВНИМАНИЕ! Отключение прав на администрирование вашего устройства для приложения Email приведет к удалению всех аккаунтов электронной почты, которые используют эти права. Кроме того, будут удалены все письма, контакты, календари и другие данные, связанные с этими аккаунтами."</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>
@@ -206,7 +245,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Синхронизировать календарь этого аккаунта"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Синхронизировать почту"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Синхронизировать почту этого аккаунта"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Вибросигнал"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Вибросигнал"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Выбрать рингтон"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Настройки сервера"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Параметры синхронизации"</string>
@@ -214,11 +253,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Синхронизировать эту папку"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Загружать сообщения при подключении к Интернету"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Период синхронизации"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Фотографии отправителей"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Доступ по протоколу POP, позволяющий этой программе подключаться, разрешен только в некоторых аккаунтах Plus. Если вам не удается войти с помощью своего адреса электронной почты и пароля, скорее всего, у вас бесплатный аккаунт (не Plus). Чтобы войти в такой аккаунт, используйте браузер."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Прежде чем настраивать аккаунт, перейдите на веб-сайт оператора связи и установите пароль для доступа к электронной почте по протоколу POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Корпоративный"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Не удалось создать аккаунт. Повторите попытку."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Электронная почта"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Включение серверных политик безопасности"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Настройки"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Общие настройки"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Подтверждать удаление"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Подтверждать отправку"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Искать в электронной почте"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Запрещать использовать камеру"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Запрашивать пароль для разблокировки"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Запрещать использовать прежние пароли"</string>
@@ -230,13 +278,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Отличная идея!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Я отвечу позже."</string>
     <string name="quick_4" msgid="216066940197616025">"Это нужно обсудить при встрече."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Для этого аккаунта отключена фоновая синхронизация в роуминге."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Отправка ответа…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Личный (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Личный (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Писем нет."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Выберите папку"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g>: выберите папку на сервере"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g>: выберите папку на сервере"</string>
     <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>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
deleted file mode 100644
index e680946..0000000
--- a/res/values-si-rLK/strings.xml
+++ /dev/null
@@ -1,296 +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">"ඊ-තැපැල් ඇමුණුම් කියවන්න"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"ඔබගේ ඊ-තැපැල් ඇමුණුම් කියවීමට යෙදුමට ඉඩ දෙන්න"</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"ඊ-තැපැල් සැපයුම් දත්ත වෙත පිවිසෙන්න"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"ලැබුණු පණිවිඩ, යැවූ පණිවිඩ, පරිශීලක නාම, සහ මුරපද ඇතුළත් ඔබගේ ඊ-තැපැල් දත්ත සමුදාය වෙත පිවිසීමට යෙදුමට ඉඩ දෙන්න."</string>
-    <string name="app_name" msgid="2206468539066258195">"ඊ-තැපෑල"</string>
-    <string name="debug_title" msgid="1337476992195531309">"නිදොස්කරණය"</string>
-    <string name="create_action" msgid="6575946089819721958">"අලුතින් නිර්මාණය කරන්න"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"ක්ෂණික ප්‍රතිචාර නොමැත."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"ගිණුම් සැකසීම්"</string>
-    <string name="status_network_error" msgid="526826323872477973">"සම්බන්ධතාවයේ ගැටලුවකි."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"පණිවිඩය ගෙන යන්න"</item>
-    <item quantity="other" msgid="5083310421670206821">"පණිවිඩ ගෙන යන්න"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"ගෙන යාම POP3 ගිණුම් වලට සහාය නොදක්වයි."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"තෝරාගැනීමට ගිණුම් කිහිපයක් අඩංගු වන නිසා ගෙන යාමට නොහැක."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"කටු සටහන වල, යන ලිපි වල සහ යැවූ ලිපි වල පණිවිඩ ගෙනයාමට නොහැක."</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"එන ලිපි"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"යන ලිපි"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"කටු සටහන්"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"අපද්‍රව්‍ය"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"යවන ලදී"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"නිසරු"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"තරුව සලකුණු කළ"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"නොකියැවූ"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"එන ලිපි"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"තරුව සලකුණු කළ"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"කටු සටහන්"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"යන ලිපි"</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_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>
-    <string name="attachment_not_found" msgid="5219773045406833000">"ඇමුණුම බාගැනීමට නොහැක."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"පණිවිඩය විකේතනය කිරීමේදී දෝෂයකි."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"ඇමුණුම් එකක් හෝ කිහිපයක් ඉදිරියට යැවීමට නොහැක."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"ඇමුණුම ඉදිරියට නොයවන ලදි"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> පුරනය වීම අසාර්ථකයි."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"පුරනය වීමට නොහැකි විය"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"ගිණුම සැකසීම"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"අනුමැතිය ඉල්ලමින්"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"පුරනය වන්න"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"සත්‍යාපනය කිරීමට නොහැකිය"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"ඊ-තැපැල් ලිපිනය හෝ මුරපදය වැරදියි"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"ඊ-තැපැල් ලිපිනය:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"ඊ-තැපැල් ගිණුම"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"ඔබට පියවර කිහිපයකින් ඔබගේ ගිණුම සකස් කළ හැක."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"ඊ-තැපැල් ලිපිනය"</string>
-    <string name="or_label" msgid="6408695162723653446">"හෝ"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google සමගින් පුරනය වන්න"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"මුරපදය"</string>
-    <string name="password_hint" msgid="4226682910292828279">"මුරපදය"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s සමගින් පුරනය වන ලදි"</string>
-    <string name="authentication_label" msgid="914463525214987772">"සත්‍යාපනය"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"සත්‍යාපනය එක් කරන්න"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"සත්‍යාපනය හිස් කරන්න"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"අතින් සැකසීම"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"වලංගු ඊ-තැපැල් ලිපිනයක් සහ මුරපදයක් ටයිප් කරන්න."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"අනුපිටපත් ගිණුම"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"ඔබ මේවන විටත් මෙම පරිශීලක නාමය \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ගිණුම සඳහා භාවිතා කරමින් සිටියි."</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"එකක් හෝ හිස්තැන් අක්ෂර කිහිපයක් සමග මෙම මුරපදය ආරම්භ වෙයි හෝ අවසාන වෙයි. බොහෝ සේවාදායකයෙන් හිස්තැන් සහිත මුරපද සඳහා සහය නොදක්වයි."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"ගිණුම් තොරතුරු සොයා ලබාගනිමින්…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"සේවාදායක සැකසීම් වලංගු කරමින්…"</string>
-    <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="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_title" msgid="8780121351085082269">"ගිණුම සැකසීම"</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>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"මෙම ක්ෂේත්‍රය හිස්විය නොහැක."</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"ගිණුම සැකසීම"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"ගිණුම් වර්ගය"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"මෙය කුමන වර්ගයේ ගිණුමක්ද?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"ගිණුම සැකසීම"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"ඇතුළට එන සේවාදායක සැකසීම්"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"පරිශීලක නාමය"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"මුරපදය"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"මුරපදය"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"සේවාදායකය"</string>
-    <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_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>
-    <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_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>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"ගිණුම සකසනය"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"පිටතට යන සේවාදායක සැකසීම්"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP සේවාදායකය"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"තොට"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ආරක්ෂක වර්ගය"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"පුරනය වීම අවශ්‍යය"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"පරිශීලක නාමය"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"මුරපදය"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"සේවාලාභී සහතිකය"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"තෝරන්න"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"සේවාදායකගේ සහතික භාවිතා කරන්න"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"ඉවත් කරන්න"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"කිසිවක් නැත"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ජංගම උපාංගය ID"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"ගිණුම් සැකසීම්"</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_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>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"සෑම මිනිත්තු 15 ට වරක්"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"සෑම මිනිත්තු 30 වරක්"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"සෑම පැයකට වරක්"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"ඊ-තැපෑල පැමිණිවිට මට දැනුම් දෙන්න"</string>
-    <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">"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>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"අවසාන දිනය"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"අවසාන දින තුන"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"අවසාන සතිය"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"අවසාන සති දෙක"</string>
-    <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_fmt" msgid="8811464534757505457">"පුරනය වීම අසාර්ථකය.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"සේවාදායකය වෙත ආරක්ෂිතව සම්බන්ධ වීමට නොහැකිය.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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_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>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"සේවාදායකයට සම්බන්ධතාවයක් වීවෘත කළ නොහැක."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"ඔබ වැරදි සේවාදායකය ලිපිනයක් ටයිප් කර ඇත නැතිනම් ඊ-තැපෑල සහය නොදක්වන ප්‍රොටොකෝල අනුවාදයක් සේවාදායකයට අවශ්‍යය."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"මෙම සේවාදායකය සමග සමමුහුර්ත වීමට ඔබට අවසර නැත. වැඩිපුර තොරතුරු සඳහා ඔබගේ සේවාදායකයේ පරිපාලකයාව අමතන්න."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"දුරස්ථ ආරක්ෂක පරිපාලනය"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"ඔබගේ Android උපාංගයේ සමහර ආරක්ෂක විශේෂාංග දුරස්ථව පාලනයට ඔබගේ අනුමැතිය <xliff:g id="SERVER">%s</xliff:g> සේවාදායකයට අවශ්‍යව ඇත. මෙම ගිණුම සැකසීම් කිරීම අවසන් කිරීමට ඔබ කැමතිද?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"මෙම සේවාදායකය ඔබගේ Android උපාංගය සහය නොදෙන ආරක්ෂක විශේෂාංග ඉල්ලා සිටියි, එනම්: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"ගිණුමේ පරිශීලක නාමය ඔබට වෙනස් කළ නොහැක. වෙනස් පරිශීලක නාමයකින් ගිණුමක් එකතු කිරීමට, ගිණුම එකතු කිරීම ස්පර්ශ කරන්න."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"අවවාදය: ඔබගේ උපාංගය පාලනය කිරීමේ ඊ-තැපෑල යෙදුමේ අධිකාරත්වය අක්‍රිය කිරීම මගින් ඔවුනගේ ඊ-තැපැල්, සම්බන්ධතා, දින දර්ශන සිදුවීම්, සහ වෙනත් දත්තද සමග එයට අවශ්‍ය සියලු ඊ-තැපැල් ගිණුම් මැකෙයි."</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_change_title" msgid="615639963487448183">"ආරක්ෂක ප්‍රතිපත්ති වෙනස්වී ඇත"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"ආරක්‍ෂිත ප්‍රතිපත්ති වෙත ලඟාවීමට නොහැක"</string>
-    <string name="account_security_title" msgid="6072273231606918870">"උපාංග ආරක්ෂාව"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="2527501853520160827">"ඔබගේ Android උපාංගයේ සමහර ආරක්ෂක විශේෂාංග දුරස්ථව පාලනයට ඔබගේ අනුමැතිය <xliff:g id="SERVER">%s</xliff:g> සේවාදායකයට අවශ්‍යව ඇත."</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>\" ට ඔබගේ තිරය අගුළු දැමීමේ PIN එක හෝ මුරපදය වෙනස් කිරීම අවශ්‍යය."</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"තිරය අගුල් දැමීමේ මුරපද කල් ඉකුත් වේ"</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">"ඔබගේ තිරය අගුළු දැමීමේ 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> සඳහා දත්ත ඔබගේ උපාංගයෙන් මකා දමනු ලැබේ. ඔබගේ තිරය අගුළු දැමීමේ PIN හෝ මුරපදය වෙනස් කිරීමෙන් ඔබට එය නැවත පිහිටුවීම කළ හැක. ඔබට දැන් එය වෙනස් කිරීමට අවශ්‍යද?"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"නොසුරැකුණු වෙනස් කිරීම් ඉවතලන්නද?"</string>
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"පුරනය වීමට නොහැකි විය"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> සඳහා පරිශීලක නාමය හෝ මුරපදය වැරදියි. ඔබට ඒවා දැන් යාවත්කාල කිරීමට අවශ්‍යද?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"ඔබගේ <xliff:g id="ACCOUNT">%s</xliff:g> පුරනය වීම අසාර්ථකයි; සේවාදායකය පවසයි: <xliff:g id="REASON">%s</xliff:g> ඔබට ඔබගේ පරිශීලක නාමය සහ/හෝ මුරපදය යාවත්කාලීන කිරීමට අවශ්‍යද?"</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>
-    <string name="account_settings_summary" msgid="4733776978291376161">"නිතර සිදු වීම්, දැනුම්දීම් අදීය සමමුහුර්ත කරන්න."</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"ඊ-තැපෑලක් පැමිණෙන විට දැනුම්දීමක් යවන්න"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"සමමුහුර්ත කිරීමේ සංඛ්‍යාතය"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"ඇතුළට එන සැකසීම්"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"පරිශීලක නාමය, මුරපදය සහ අනෙකුත් ඇතුළට එන සේවාදායක සැකසීම්"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"පිටතට යන සැකසීම්"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"පරිශීලක නාමය, මුරපදය සහ අනෙකුත් පිටතට යන සේවාදායක සැකසීම්"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"ප්‍රතිපත්ති බලාත්මක කරන ලදි"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"කිසිවක් නැත"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"සහය නොදක්වන ප්‍රතිපත්ති"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"කිසිවක් නැත"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"සමමුහුර්ත කිරීමේ උත්සාහය"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"මෙම ගිණුම සමමුහුර්ත කිරීමට මෙහි ස්පර්ශ කරන්න"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"ගිණුමේ නම"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"ඔබගේ නම"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"ක්ෂණික ප්‍රතිචාර"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"ඊ-තැපෑලක් සාදන විට ඔබ නිතර ඇතුළත් කරන පෙළ සංස්කරණය කරන්න"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"දැනුම්දීම් සැකසීම්"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"දත්ත භාවිතය"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"ආරක්‍ෂක ප්‍රතිපත්ති"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"පද්ධති ෆෝල්ඩර"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"අපද්‍රව්‍ය ෆෝල්ඩරය"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"ඔබගේ සේවාදායකයේ අපද්‍රව්‍ය ෆෝල්ඩරය තෝරන්න"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"ඔබගේ සේවාදායකයේ අපද්‍රව්‍ය ෆෝල්ඩරය තෝරන්න"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"යවන අයිතම ෆෝල්ඩරය"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"ඔබගේ සේවාදායකයේ යැවූ අයිතම ෆෝල්ඩරය තෝරන්න"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"ඔබගේ සේවාදායකයේ යවන අයිතම ෆෝල්ඩරය තෝරන්න"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"ක්ෂණික ප්‍රතිචාරය"</string>
-    <string name="save_action" msgid="5740359453077441466">"සුරකින්න"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"සම්බන්ධතා සමමුහුර්ත කරන්න"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"මෙම ගිණුම සඳහා සම්බන්ධතා සමමුහුර්ත කරන්න"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"දින දර්ශනය සමමුහුර්ත කරන්න"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"මෙම ගිණුම සඳහා දින දර්ශන සිදුවීම සමමුහුර්ත කරන්න"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ඊ-තැපෑල සමමුහුර්ත කරන්න"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"මෙම ගිණුම සඳහා ඊ-තැපෑල සමමුහුර්ත කරන්න"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"කම්පනය වීම"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"රිංග්ටෝනය තෝරන්න"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"සේවාදායක සැකසීම්"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"සමමුහුර්ත කිරීමේ විකල්ප"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"සමමුහුර්ත කිරීමේ විකල්ප (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"මෙම් ෆෝල්ඩරය සමමුහුර්ත කරන්න"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"සම්බන්ධ වූ විටදී පණිවිඩ බාගත වෙයි"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"සමමුහුර්ත කළ යුතු තැපැල් සඳහා දින"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"යවන්නාගේ රුපය"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"POP පිවිසුම ඇතුළත් සමහරක් \"Plus\" ගිණුම් පමණක් මෙම වැඩසටහනට සම්බන්ද වීමට අවසර දෙයි.ඔබගේ නිවැරදි ඊ-තැපැල් ලිපිනය සහ මුරපදය සමග ඔබට පුරණය වීමට ඔබට නොහැකිනම්, ඔබට ගෙවූ \"Plus\" ගිණුමක් නොතිබෙනවා විය හැක. මෙම ඊ-තැපැල් ගිණුම්වලට පිවිසුම ලැබීමට වෙබ් බ්‍රව්සරය අරඹන්න."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"මෙම ඊ-තැපැල් ගිණුම සැකසීමට පෙර, T-Online වෙබ් අඩවිය වෙත ගොස් POP3 ඊ-තැපැල් පිව්සුම සඳහා මුරපදයක් සාදන්න."</string>
-    <string name="exchange_name" msgid="3793803477985438102">"සංස්ථාපිත"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ක්‍රියාකාරී සමමුහුර්තය"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"ගිණුම සෑදිය නොහැක. නැවත උත්සහ කරන්න."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"ඊ-තැපෑල"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"සේවාදායකය-විශේෂණය කළ ආරක්ෂක ප්‍රතිපත්තීන් සබල කර ඇත"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"සැකසීම්"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"පොදු සැකසීම්"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"තහවුරු කිරීමට පෙර මකන්න"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"යැවීමට පෙර තහවුරු කරන්න"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"ඊ-තැපෑල සොයන්න"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"උපාංගවල කැමරාව භාවිතයට ඉඩ නොදෙන්න"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"උපාංග මුරපදයක් අවශ්‍යය"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"මෑත කාලින මුරපද නැවත භාවිතය සීමා කරන්න"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"කල් ඉකුත් වීමට මුරපද අවශ්‍යය"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"එහි තිරය අගුළු දැමීමට උපාංගය නිකම් තිබීම අවශ්‍යය"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"සමමුහුර්ත කරන ලද දින දර්ශන සිද්ධි ගණන සිමා කරන්න"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"සමමුහුර්ත කරන ලද ඊ-තැපෑල් ගණන සිමා කරන්න"</string>
-    <string name="quick_1" msgid="9130521670178673190">"ස්තුතියි!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"මට හොඳ යැයි දැනෙයි!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"මම මෙය පසුව කියවා ආපසු ඔබට පිළිතුරු දෙන්නම්."</string>
-    <string name="quick_4" msgid="216066940197616025">"මෙය සාකච්ඡා කිරීමට රැස්වීමක් සුදානම් කරමු."</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"රෝමින් කරද්දී මෙම ගිණුම සඳහා පසුබිම් සමමුහුර්ත කිරීම අබල කර ඇත."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"ප්‍රතිචාරය යවමින්..."</string>
-    <string name="no_conversations" msgid="3785854971159919343">"පණිවිඩ නැත."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"ෆෝල්ඩරය තෝරනය"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> සඳහා සේවාදායක අපද්‍රව්‍ය ෆෝල්ඩරය තෝරන්න"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> සඳහා සේවාදායකය යැවුම් අයිතම තෝරන්න"</string>
-    <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>
-</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 55a03e1..bd36ca7 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -21,16 +21,25 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Prístup k údajom poskytovateľa e-mailu"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Povoľuje aplikácii prístup do databázy e-mailu vrátane prijatých a odoslaných správ, používateľských mien a hesiel."</string>
     <string name="app_name" msgid="2206468539066258195">"E-mail"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Ladiť"</string>
     <string name="create_action" msgid="6575946089819721958">"Vytvoriť novú"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Žiadne rýchle odpovede."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Nastavenia účtu"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Problém s pripojením."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Presunúť správu"</item>
+    <item quantity="other" msgid="5083310421670206821">"Presunúť správy"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Účty s protokolom POP3 nepodporujú presun."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Správu nie je možné presunúť, pretože výber obsahuje viacero účtov."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Správy v priečinkoch Koncepty, Pošta na odoslanie a Odoslané nie je možné presunúť."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Doručená pošta"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Pošta na odoslanie"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Koncepty"</string>
     <string name="mailbox_name_display_trash" msgid="7020792045007681852">"Kôš"</string>
     <string name="mailbox_name_display_sent" msgid="6705058612006729985">"Odoslané"</string>
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Nevyžiadaná pošta"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"S hviezdičkou"</string>
+    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Označené hviezdičkou"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Neprečítané"</string>
     <string name="debug_title" msgid="1337476992195531309">"Ladiť"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Kombinované zobrazenie"</string>
@@ -38,11 +47,28 @@
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Vložiť rýchlu odpoveď"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Vložiť rýchlu odpoveď"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Jedna alebo viac príloh zo správy posielanej ďalej budú pred odoslaním stiahnuté."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Prílohu sa nepodarilo stiahnuť."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Pri dekódovaní správy sa vyskytla chyba."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Nepodarilo sa poslať ďalej jednu alebo viac príloh."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Príloha nebola poslaná ďalej"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Prihlásenie do účtu <xliff:g id="ACCOUNT_NAME">%s</xliff:g> zlyhalo."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Prihlásenie sa nepodarilo"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Nastavenie účtu"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Prebieha žiadosť o autorizáciu"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Prihlásenie"</string>
@@ -64,17 +90,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Zadajte platnú e-mailovú adresu a heslo."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Duplikovať účet"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Toto používateľské meno už používate pre účet „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Toto heslo začína alebo končí aspoň jednou medzerou. Mnoho serverov nepodporuje heslá s medzerami."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Načítavajú sa informácie o účte…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Overujú sa nastavenia servera…"</string>
     <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>, ale môže používať aj protokol <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Nastavenie účtu"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Toto pole nesmie byť prázdne."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Nastavenie účtu"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Typ účtu"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"O aký typ účtu ide?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Nastavenie účtu"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Nastavenia servera prichádzajúcej pošty"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"POUŽÍVATEĽSKÉ MENO"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"HESLO"</string>
@@ -92,18 +123,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Pri odstránení z Doručenej pošty"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Predpona cesty IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Voliteľné"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Nastavenie účtu"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Nastavenia servera odchádzajúcej pošty"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SERVER SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"TYP ZABEZPEČENIA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Vyžadovať prihlásenie"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"POUŽÍVATEĽSKÉ MENO"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"HESLO"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFIKÁT KLIENTA"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Vybrať"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Použite certifikát klienta"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Odstrániť"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Žiadny"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID MOBILNÉHO ZARIADENIA"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Nastavenia účtu"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Možnosti účtu"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Frekvencia synchronizácie:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nikdy"</string>
@@ -129,6 +163,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Všetky"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Použiť predv. nast. účtu"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Používateľské meno alebo heslo je nesprávne."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Prihlásenie zlyhalo.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problém s nastavením účtu"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Potvrďte správnosť používateľského mena, hesla a nastavení účtu."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Nepodarilo sa bezpečne pripojiť k serveru."</string>
@@ -147,6 +182,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Vzdialená správa zabezpečenia"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Server <xliff:g id="SERVER">%s</xliff:g> vyžaduje povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho zariadenia Android. Chcete dokončiť nastavenie tohto účtu?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Tento server vyžaduje bezpečnostné funkcie, ktoré vaše zariadenie so systémom Android nepodporuje (vrátane: <xliff:g id="ERROR">%s</xliff:g>)."</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Používateľské meno účtu nemôžete zmeniť. Ak chcete pridať účet s iným používateľským menom, dotknite sa možnosti Pridať účet."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"UPOZORNENIE: Ak deaktivujete oprávnenie aplikácie E-mail spravovať toto zariadenie, budú odstránené všetky účty aplikácie E-mail, ktoré toto oprávnenie vyžadujú. Spoločne s týmito účtami budú odstránené aj všetky ich e-maily, kontakty, udalosti kalendára a ďalšie údaje."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Bezpečnostná aktualizácia"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> vyžaduje, aby ste zmenili nastavenia zabezpečenia."</string>
@@ -168,6 +204,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Heslo na uzamknutie obrazovky vypršalo"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"V zariadení prebieha vymazanie údajov účtu <xliff:g id="ACCOUNT">%s</xliff:g>. Môžete ich obnoviť zmenou kódu PIN alebo hesla na uzamknutie obrazovky. Chcete to zmeniť teraz?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Zahodiť neuložené zmeny?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Prihlásenie sa nepodarilo"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Používateľské meno alebo heslo pre účet <xliff:g id="ACCOUNT">%s</xliff:g> je nesprávne. Chcete ich aktualizovať?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Prihlásenie do účtu <xliff:g id="ACCOUNT">%s</xliff:g> zlyhalo. Odpoveď servera: <xliff:g id="REASON">%s</xliff:g> Chcete aktualizovať svoje používateľské meno alebo heslo?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Sťahovať všetky prílohy"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Automaticky sťahovať prílohy najnovších správ prostredníctvom siete Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Upozornenia na poštu"</string>
@@ -206,19 +245,28 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synchr. udalosti kalendára pre účet"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synchr. poštu"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synchr. poštu pre tento účet"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrovanie"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrovať"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Zvoliť tón zvonenia"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Nastavenia servera"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Možnosti synchronizácie"</string>
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"Možnosti synchronizácie (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Synchronizovať tento priečinok"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Správy sa stiahnu po pripojení"</string>
+    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Po pripojení sa prevezmú správy"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Počet dní na synchronizáciu pošty"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Obrázok odosielateľa"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Len niektoré účty Plus majú prístup prostredníctvom protokolu POP, ktorý umožňuje pripojenie tohto programu. Ak sa nemôžete prihlásiť so správnou e-mailovou adresou a heslom, pravdepodobne nemáte platený účet „Plus“. Ak chcete pristupovať k týmto e-mailovým účtom, urobte tak prostredníctvom webového prehliadača."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Pred nastavením tohto e-mailového účtu navštívte webové stránky T-Online a vytvorte heslo pre e-mailový prístup POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Firemný"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Účet sa nepodarilo vytvoriť. Skúste to znova."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Poslať e-mail"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Povoľuje pravidlá zabezpečenia určené serverom"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Nastavenia"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Všeobecné nastavenia"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Pred odstránením potvrdiť"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Pred odoslaním potvrdiť"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Hľadať e-mail"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Zakázať použitie fotoaparátu zariadenia"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Vyžadovať heslo zariadenia"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Obmedziť opak. použitie nedávnych hesiel"</string>
@@ -230,13 +278,15 @@
     <string name="quick_2" msgid="8611591278119481491">"To znie dobre!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Prečítam si to neskôr a ozvem sa."</string>
     <string name="quick_4" msgid="216066940197616025">"Môžeme si dohodnúť stretnutie, aby sme to prediskutovali."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Synchronizácia na pozadí je pre tento účet v roamingu zakázaná."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Odosiela sa odpoveď..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Osobný (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Osobný (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Žiadne správy."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Výber priečinka"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Priečinok Kôš servera pre <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Prieč. odosl. polož. servera pre <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Prebieha načítavanie zoznamu priečinkov..."</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"K dispozícii nie je žiadna odpoveď"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Nastavenia synchronizácie priečinka"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c2fcdac..ed70a76 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Dostop do podatkov e-poštnega ponudnika"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Programu omogoča dostop do vaše e-poštne zbirke podatkov, vključno s prejetimi in poslanimi sporočili, uporabniškimi imeni in gesli."</string>
     <string name="app_name" msgid="2206468539066258195">"E-pošta"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Odpravljanje napak"</string>
     <string name="create_action" msgid="6575946089819721958">"Ustvari novega"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Ni hitrih odzivov."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Nastavitve računa"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Težava s povezavo."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Premikanje sporočil"</item>
+    <item quantity="other" msgid="5083310421670206821">"Premikanje sporočil"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Računi POP3 ne podpirajo premikanja sporočil."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Sporočil ni mogoče premakniti, ker izbor vsebuje več računov."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Sporočila v mapah »Osnutki«, »Odpošlji« in »Poslano« ni mogoče premakniti."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Prejeto"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Odpošlji"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Osnutki"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Vsiljena pošta"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Z zvezdico"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Neprebrano"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Odpravljanje napak"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Prejeto"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Z zvezdico"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Osnutki"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Odpošlji"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Kombiniran pogled"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Izvirno sporočilo --------\nZadeva: <xliff:g id="SUBJECT">%1$s</xliff:g>\nOd: <xliff:g id="SENDER">%2$s</xliff:g>\nZa: <xliff:g id="TO">%3$s</xliff:g>\nKp: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Vstavi hiter odgovor"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Vstavi hiter odgovor"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Ena ali več prilog v posredovanem sporočilu bo pred pošiljanjem prenesena iz strežnika."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Priloge ni bilo mogoče prenesti."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Napaka pri dekodiranju sporočila."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Ene ali več prilog ni bilo mogoče posredovati."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Priloga ni bila posredovana"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Prijava v <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ni uspela."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Prijava ni uspela"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Nastavitev računa"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Zahtevanje odobritve"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Prijava"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Vnesite veljaven e-poštni naslov in geslo."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Podvojeni račun"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"To uporabniško ime že uporabljate za račun »<xliff:g id="DUPLICATE">%s</xliff:g>«."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Geslo se začne ali konča z vsaj enim presledkom. Številni strežniki ne podpirajo gesel s presledki."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Pridobivanje podatkov o računu..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Preverjanje nastavitev strežnika ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Preverjanje nastavitev SMTP ..."</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Ustvarjanje računa ..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Potrdite vrsto računa"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Navedli ste, da e-poštni račun <xliff:g id="EMAIL">%1$s</xliff:g> uporablja <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, vendar morda uporablja <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>."</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Nastavitev računa"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Vaš račun je pripravljen in e-pošta je poslana."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Poimenujte račun (neobvezno)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Vaše ime (prikazano v odhodnih sporočilih)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"To polje ne sme biti prazno."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Nastavitev računa"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Vrsta računa"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Katera vrsta računa je to?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Nastavitev računa"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Nastavitve strežnika za dohodno pošto"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"UPORABNIŠKO IME"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"GESLO"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Ko sporočilo izbrišem iz mape »Prejeto«"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Predpona poti IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Neobvezno"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Nastavitev računa"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Nastavitve strežnika za odhodno pošto"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"STREŽNIK SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"VRATA"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"VRSTA VARNOSTI"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Zahtevaj prijavo"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"UPORABNIŠKO IME"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"GESLO"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"POTRDILO ODJEMALCA"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Izberi"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Uporaba potrdila odjemalca"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Odstrani"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Brez"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID MOBILNE NAPRAVE"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Nastavitve računa"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Možnosti računa"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Pogostost sinhronizacije:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Nikoli"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Vse"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Uporaba privzetega za račun"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Uporabniško ime ali geslo ni pravilno."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Prijava ni uspela.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Težava z nastavitvijo računa"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Potrdite, da so uporabniško ime, geslo in nastavitve računa pravilni."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"S strežnikom se ni mogoče varno povezati."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Varnostno skrbništvo na daljavo"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Strežniku <xliff:g id="SERVER">%s</xliff:g> morate dovoliti, da na daljavo nadzira nekatere varnostne funkcije vaše naprave Android. Ali želite dokončati nastavitev tega računa?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Za ta strežnik so potrebne varnostne funkcije, ki jih vaša naprava Android ne podpira: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Uporabniškega imena za račun ni mogoče spreminjati. Če želite dodati račun z drugim uporabniškim imenom, se dotaknite možnosti »Dodaj račun«."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"Opozorilo: Če onemogočite pravico e-poštnega programa za upravljanja naprave, boste izbrisali vse e-poštne račune, ki jo potrebujejo, skupaj z e-pošto, stiki, dogodki koledarja in drugimi podatki."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Varnostna posodobitev"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"Za račun <xliff:g id="ACCOUNT">%s</xliff:g> morate posodobiti varnostne nastavitve."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Geslo za zaklepanje zaslona je poteklo"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Podatki za <xliff:g id="ACCOUNT">%s</xliff:g> bodo izbrisani iz naprave. Če jih želite obnoviti, spremenite PIN ali geslo za zaklepanje zaslona. Ali ga želite spremeniti zdaj?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Želite zavreči neshranjene spremembe?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Prijava ni uspela"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Ime ali geslo za <xliff:g id="ACCOUNT">%s</xliff:g> ni pravilno. Ali ga želite posodobiti zdaj?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Prijava v račun <xliff:g id="ACCOUNT">%s</xliff:g> ni uspela; strežnik je navedel razlog: <xliff:g id="REASON">%s</xliff:g> Ali želite posodobiti uporabniško ime ali geslo?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Prenesi priloge"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Samodejni prenos prilog k nedavnim sporočilom s povezavo Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"E-poštna obvestila"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinhr. dogodek iz kol. za ta račun"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sinhroniz. e-pošte"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sinhroniziraj e-pošto za ta račun"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibriranje"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibriranje"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Izberite melodijo zvonjenja"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Nastavitve strežnika"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Možnosti sinhronizacije"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Sinhronizacija te mape"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Sporočila bodo prenesena, ko bo vzpostavljena povezava"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Sinhronizacija pošte za toliko dni"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Slika pošiljatelja"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Samo nekateri računi »Plus« ponujajo tudi dostop do strežnika POP, da se lahko ta program poveže. Če ste pravilno vnesli svoj e-poštni naslov in geslo, a se ne morete prijaviti, morda nimate plačljivega računa »Plus«. Zaženite brskalnik, če želite dostopati do teh e-poštnih računov."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Preden nastavite ta e-poštni račun, pojdite na spletno mesto T-Online in ustvarite geslo za e-poštni dostop POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Podjetje"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Računa ni bilo mogoče ustvariti. Poskusite znova."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-pošta"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Omogoči varnostne pravilnike, ki jih določi strežnik"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Nastavitve"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Splošne nastavitve"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Potrditev pred brisanjem"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Potrditev pred pošiljanjem"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Iskanje po e-pošti"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Ne dovoli uporabe kamere naprave"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Zahtevaj geslo naprave"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Omeji vnovično uporabo nedavnih gesel"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Velja!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Trenutno nimam časa. Odgovorim pozneje."</string>
     <string name="quick_4" msgid="216066940197616025">"Skličimo sestanek in se pogovorimo."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Sinhronizacija v ozadju je za ta račun med gostovanjem onemogočena."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Pošiljanje odgovora ..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Osebno (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Osebno (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Ni sporočil."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Izbirnik map"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Izberite mapo koša strežnika za račun <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Izberite mapo strežnika za poslana sporočila za račun <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Nalaganje seznama map ..."</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Na voljo ni hitrih odgovorov"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Nastavitve sinhronizacije za mapo"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 734405f..0dbfab2 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Приступ подацима о добављачу е-поште"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Омогућава да ова апликација приступа бази података е-поште, укључујући примљене поруке, послате поруке, корисничка имена и лозинке."</string>
     <string name="app_name" msgid="2206468539066258195">"Пошаљи имејлом"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Отклањање грешака"</string>
     <string name="create_action" msgid="6575946089819721958">"Направи нови"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Нема брзих одговора."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Подешавања налога"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Проблем са везом."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Премештање поруке"</item>
+    <item quantity="other" msgid="5083310421670206821">"Премештање порука"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Премештање није подржано на POP3 налозима."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Премештање није могуће зато што избор обухвата више налога."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Поруке у директоријумима Недовршене, За слање и Послате није могуће премештати."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Примљене"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"За слање"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Недовршене"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Безвредне"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Са звездицом"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Непрочитано"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Отклањање грешака"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Пријемно сандуче"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Са звездицом"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Недовршене"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"За слање"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Није могуће преузети прилог."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Дошло је до грешке при декодирању поруке."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Није могуће проследити један или више прилога."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Прилог није прослеђен"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Пријављивање на налог <xliff:g id="ACCOUNT_NAME">%s</xliff:g> није успело."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Пријављивање није могуће"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Подешавање налога"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Захтевање овлашћења"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Пријављивање"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Унесите важећу имејл адресу и лозинку."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Дуплирани налог"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Већ користите ово корисничко име за налог „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Ова лозинка почиње или се завршава једним размаком или више њих. Многи сервери не подржавају лозинке са размацима."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Преузимање информација о налогу је у току…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Потврђивање подешавања сервера..."</string>
     <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_names_title" msgid="8780121351085082269">"Подешавање налога"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Ово поље не сме да буде празно."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Подешавање налога"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Тип налога"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Који је ово тип налога?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Подешавање налога"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Подешавања сервера за долазну пошту"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"КОРИСНИЧКО ИМЕ"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ЛОЗИНКА"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Подешавање налога"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Подешавања сервера за одлазну пошту"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP СЕРВЕР"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ПОРТ"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ТИП БЕЗБЕДНОСТИ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Захтевај пријављивање"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"КОРИСНИЧКО ИМЕ"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ЛОЗИНКА"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"СЕРТИФИКАТ КЛИЈЕНТА"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Изабери"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Користи сертификат клијента"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Уклони"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Ниједан"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ИД МОБИЛНОГ УРЕЂАЈА"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Подешавања налога"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"Пријављивање није успело.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Удаљено безбедносно администрирање"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"Не можете да промените корисничко име налога. Да бисте додали налог са другим корисничким именом, додирните Додај налог."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"УПОЗОРЕЊЕ: Деактивирањем овлашћења апликације Имејл за управљање уређајем избрисаћете све налоге е-поште који то·захтевају, заједно са адресом е-поште, контактима, догађајима календара и другим подацима."</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>
@@ -168,6 +207,9 @@
     <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> се бришу са уређаја. Можете да их вратите ако промените PIN или лозинку за закључавање екрана. Желите ли да их промените сада?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Желите ли да одбаците несачуване промене?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Пријављивање није могуће"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Корисничко име или лозинка за налог <xliff:g id="ACCOUNT">%s</xliff:g> нису тачни. Да ли желите да их ажурирате сада?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Пријављивање на <xliff:g id="ACCOUNT">%s</xliff:g> није успело; сервер је рекао: <xliff:g id="REASON">%s</xliff:g> Желите ли да ажурирате корисничко име и/или лозинку?"</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>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Синхр. дог. календара за овај налог"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Синхронизуј е-пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Синхронизуј е-пошту за овај налог"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Вибрирај"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Вибрација"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Изабери мелодију звона"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Подешавања сервера"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Опције синхронизације"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Синхронизуј овај директоријум"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Поруке ће бити преузете после повезивања"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Дани поште за синхронизацију"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Слика пошиљаоца"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Само неки „Плус“ налози подржавају приступ преко POP протокола, што омогућава повезивање овог програма. Ако не можете да се пријавите користећи тачну имејл адресу и лозинку, можда немате плаћени „Плус“ налог. Покрените веб прегледач да бисте приступили овим налозима е-поште."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Пре него што подесите овај налог е-поште, посетите T-Online веб сајт и направите лозинку за приступ е-пошти преко POP3 протокола."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Corporate"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Није могуће отворити налог. Покушајте поново."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Пошаљи имејлом"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Омогућава безбедносне смернице за одређене сервере"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Подешавања"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Општа подешавања"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Потврди пре брисања"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Потврди пре слања"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"&gt;999"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Search email"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Онемогући коришћење камере уређаја"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Захтевај лозинку за уређај"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Ограничи пон. коришћење недавних лозинки"</string>
@@ -230,13 +281,16 @@
     <string name="quick_2" msgid="8611591278119481491">"Добра идеја!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Прочитаћу ово касније и јавити вам."</string>
     <string name="quick_4" msgid="216066940197616025">"Хајде да организујемо састанак како бисмо о овоме разговарали."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Синхронизација у позадини за овај налог је онемогућена у ромингу."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Слање одговора..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Лични (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Лични (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Нема порука."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP приступ"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Бирач директоријума"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Изаберите директоријум за отпад на серверу за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Изаберите директоријум на серверу за послато за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <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>
+    <!-- no translation found for gmail_name (2099786953868369991) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ff3b98f..2889694 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Använd data från e-postleverantören"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Tillåter att appen kommer åt e-postdatabasen med bland annat mottagna meddelanden, skickade meddelanden, användarnamn och lösenord."</string>
     <string name="app_name" msgid="2206468539066258195">"E-post"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Felsökning"</string>
     <string name="create_action" msgid="6575946089819721958">"Skapa nytt"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Inga snabba svar."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Kontoinställningar"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Anslutningsproblem."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Flytta meddelandet"</item>
+    <item quantity="other" msgid="5083310421670206821">"Flytta meddelanden"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3-konton har inte stöd för att flytta meddelanden."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Det går inte att flytta meddelandena. De markerade objekten kommer från flera olika konton."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Det går inte att flytta meddelanden i Utkast, Utkorgen och Skickade."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Inkorgen"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Utkorgen"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Utkast"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Skräp"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Stjärnmärkt"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Olästa"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Felsökning"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Inkorgen"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Stjärnmärkta"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Utkast"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Utkorgen"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Kombinerad vy"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Ursprungligt meddelande --------\nÄmne: <xliff:g id="SUBJECT">%1$s</xliff:g>\nFrån: <xliff:g id="SENDER">%2$s</xliff:g>\nTill: <xliff:g id="TO">%3$s</xliff:g>\nKopia: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Infoga snabbsvar"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Infoga snabbsvar"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"En eller flera bilagor i det vidarebefordrade meddelandet hämtas innan de skickas."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Det gick inte att hämta bilagan."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Ett fel inträffade när meddelandet avkodades."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Det gick inte att vidarebefordra en eller flera bilagor."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Bilagan vidarebefordrades inte"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Det gick inte att logga in <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Det gick inte att logga in."</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Kontoinställningar"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Begär auktorisering"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Logga in"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Ange en giltig e-postadress och lösenord."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Dubblettkonto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Du använder redan det här användarnamnet för kontot <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Det här lösenordet inleds eller avslutas med ett eller flera mellanslag. Många servrar saknar stöd för lösenord med mellanslag."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Hämtar kontoinformation…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Validerar serverinställningar ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Validerar SMTP-inställningar ..."</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Skapar kontot ..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Bekräfta kontotyp"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Du har angett att <xliff:g id="EMAIL">%1$s</xliff:g> använder <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, men kontot kanske använder <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Kontoinställningar"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Ditt konto är färdigt och snart kan du skicka och ta emot e-postmeddelanden."</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Ge kontot ett namn (valfritt)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Ditt namn (visas för utgående meddelanden)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Fältet får inte vara tomt."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Kontoinställningar"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Kontotyp"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Vilken typ av konto är det här?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Kontoinställningar"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Inkommande serverinställningar"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ANVÄNDARNAMN"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"LÖSENORD"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"När jag tar bort något från min Inkorg"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP-sökvägsprefix"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Valfritt"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Kontoinställningar"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Utgående serverinställningar"</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">"SÄKERHETSTYP"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Kräv inloggning"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ANVÄNDARNAMN"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"LÖSENORD"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"KLIENTCERTIFIKAT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Välj"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Använd klientcertifikat"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Ta bort"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Inga"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"DEN MOBILA ENHETENS ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Kontoinställningar"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Kontoalternativ"</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">"Aldrig"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Alla"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Använd kontostandarden"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Användarnamnet eller lösenordet är felaktigt."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Inloggningen misslyckades.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problem med att konfigurera kontot"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Bekräfta att användarnamn, lösenord och kontoinställningar är rätt."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Det går inte att upprätta en säker anslutning till servern."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Fjärradministrera säkerhet"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Servern <xliff:g id="SERVER">%s</xliff:g> måste kunna fjärrkontrollera vissa säkerhetsfunktioner i din Android-enhet. Vill du slutföra konfigurationen av kontot?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Den här servern kräver säkerhetsfunktioner som din Android-enhet inte stöder, inklusive: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Det går inte att ändra användarnamnet för ett konto. Om du vill lägga till ett konto med ett annat användarnamn trycker du på Lägg till konto."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"VARNING! Om du inaktiverar e-postappens behörighet att administrera enheten raderas alla e-postkonton som behöver behörigheten. Även e-post, kontakter, kalenderhändelser och andra data raderas."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Säkerhetsuppdatering"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"Enligt <xliff:g id="ACCOUNT">%s</xliff:g> måste du uppdatera säkerhetsinställningarna."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Skärmlåslösenordet har gått ut"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Alla data för <xliff:g id="ACCOUNT">%s</xliff:g> tas bort från enheten. Du kan återställa dem genom att ändra PIN-koden eller lösenordet för skärmlåset. Vill du göra det nu?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Vill du ignorera ändringar som inte har sparats?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Det gick inte att logga in."</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Användarnamnet eller lösenordet för <xliff:g id="ACCOUNT">%s</xliff:g> är felaktigt. Vill du uppdatera dem nu?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Det gick inte att logga in på <xliff:g id="ACCOUNT">%s</xliff:g>. Servern svarade: <xliff:g id="REASON">%s</xliff:g> Vill du uppdatera ditt användarnamn och/eller ditt lösenord?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Hämta bilagor"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Hämta automatiskt bilagor för de senaste meddelandena via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"E-postaviseringar"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synka kalenderhändelse för kontot"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synkronisera e-post"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synkronisera e-post för det här kontot"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Vibrera"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrera"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Välj ringsignal"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Serverinställningar"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Synkroniseringsalternativ"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Synkronisera den här mappen"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Meddelandena hämtas när du är ansluten"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Dagar med e-post som ska synkroniseras"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Bild på avsändare"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"POP-åtkomst, som gör att denna app kan ansluta, ingår bara i vissa pluskonton. Om det inte går att logga in med rätt e-postadress och lösenord kanske du inte har betalat för ett pluskonto. Öppna webbläsaren igen om du vill få åtkomst till dessa e-postkonton."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Innan du skapar e-postkontot besöker du T-Onlines webbplats och skapar ett lösenord för POP3-åtkomst till e-post."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Företag"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Det gick inte att skapa kontot. Försök igen."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-post"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Aktiverar serverangivna säkerhetsprinciper"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Inställningar"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Allmänna inställningar"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Bekräfta innan du tar bort"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Bekräfta innan du skickar"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"&gt;999"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Sök efter e-post"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Tillåt inte användning av kameran"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Kräv lösenord för enheten"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Begränsa återanvändning av lösenord"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Låter bra!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Jag läser detta senare och återkommer till dig."</string>
     <string name="quick_4" msgid="216066940197616025">"Vi kan diskutera detta på ett möte."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Bakgrundssynkronisering för det här kontot har inaktiverats vid roaming."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Skickar svar ..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personligt (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personligt (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Inga meddelanden."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Mappväljaren"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Välj mapp för papperskorgen på servern för <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Välj mapp för skickade objekt på servern för <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Mapplistan läses in …"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Inga tillgängliga"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Iinställningar för mappsynkronisering"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 2c641a5..43aa065 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Fikia data ya mtoa huduma wa barua pepe"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Huruhusu programu hii kufikia hifadhidata yako ya barua pepe, ikiwa ni pamoja na barua pepe ulizopokea, zile ulizotuma, majina ya mtumiaji na manenosiri."</string>
     <string name="app_name" msgid="2206468539066258195">"Barua pepe"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Tatua"</string>
     <string name="create_action" msgid="6575946089819721958">"Unda mpya"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Hakuna majibu ya haraka."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Mipangilio ya akaunti"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Tatizo la kuunganisha."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Hamisha ujumbe"</item>
+    <item quantity="other" msgid="5083310421670206821">"Hamisha ujumbe"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Uhamishaji hauauniwi kwenye akaunti za POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Haiwezi kuhamisha. Uteuzi una akaunti mbalimbali."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Ujumbe katika Rasimu, Kikasha toezi na Zilizotumwa haziwezi kuhamishwa."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Kikasha"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Kikasha toezi"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Rasimu"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Taka"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Zenye Nyota"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Ambazo Hazijasomwa"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Tatua"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Kikasha"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Zenye nyota"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Rasimu"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Kikasha toezi"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Vikasha vyote kwa pamoja"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Ujumbe Asili --------\nKichwa: <xliff:g id="SUBJECT">%1$s</xliff:g>\nKutoka: <xliff:g id="SENDER">%2$s</xliff:g>\nKwa: <xliff:g id="TO">%3$s</xliff:g>\nNakala kwa: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Ingiza majibu ya haraka"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Ingiza jibu la haraka"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Kiambatisho kimoja au zaidi katika ujumbe wako uliosambazwa kitapakuliwa kabla ya kutumwa."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Haikuweza kupakia kiambatisho hiki."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Kulikuwa na hitilafu wakati wa usimbuaji wa ujumbe."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Haikuweza kusambaza kiambatisho kimoja au zaidi."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Kiambatishho hakijasambazwa"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Kuingia <xliff:g id="ACCOUNT_NAME">%s</xliff:g> hakujafaulu."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Haikuweza kuingia"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"B <xliff:g id="SIZE_IN_BYTES">%d</xliff:g>"</item>
+    <item quantity="other" msgid="1883360269853654045">"B <xliff:g id="SIZE_IN_BYTES">%d</xliff:g>"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"KB <xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>"</item>
+    <item quantity="other" msgid="7476806336055136146">"KB <xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"MB <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>"</item>
+    <item quantity="other" msgid="3317120193748830799">"MB <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"GB <xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>"</item>
+    <item quantity="other" msgid="1607574223219436099">"GB <xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Kufungua akaunti"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Inaomba idhini"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Ingia katika akaunti"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Tafadhali andika anwani na nenosiri halali ya barua pepe."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Akaunti Rudufu"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Tayari unatumia jina hili la mtumiaji kwa akaunti \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Nenosiri hili linaanza au kumalizika na herufi moja ya nafasi. Seva nyingi hazikubali manenosiri yenye nafasi."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Inaleta maelezo ya akaunti"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Inathibitisha mipangilio ya seva…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Inathibitisha mipangilio ya smtp…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Akaunti inafunguliwa…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Thibitisha aina ya akaunti"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Uliashiria kuwa <xliff:g id="EMAIL">%1$s</xliff:g> hutumia <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, lakini huenda akaunti inatumia <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Kufungua akaunti"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Akaunti yako imefunguliwa, na barua pepe iko njiani yaja!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Ipe akaunti hii jina (ya hiari)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Jina lako (litakaloonyeshwa kwenye barua pepe zitakazotumwa)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Sehemu hii haiwezi kuachwa tupu."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Kufungua akaunti"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Aina ya akaunti"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Hii ni akaunti ya aina gani ?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Kufungua akaunti"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Mipangilio ya seva ya kuingia"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"JINA LA MTUMIAJI"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"NENOSIRI"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Ninapofuta kutoka katika kikasha"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Kiambishi cha njia ya IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Hiari"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Kufungua akaunti"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Mipangilio ya seva ya kutoka"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SEVA YA SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"MLANGO"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"AINA YA USALAMA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Hitaji kuingia kwenye akaunti"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"JINA LA MTUMIAJI"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"NENOSIRI"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CHETI CHA KITEJA"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Chagua"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Tumia cheti cha mteja"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Ondoa"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Hakuna"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"KITAMBULISHO CHA KIFAA CHA MKONONI"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Mipangilio ya akaunti"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Chaguo za akaunti"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Marudio ya usawazishaji:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Katu"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Zote"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Tumia chaguo-msingi la akaunti"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Jina la mtumiaji au nenosiri sio sahihi."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Kuingia kumeshindikana.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Tatizo la kufungua akaunti"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Thibitisha jina la mtumiaji, nenosiri, na mipangilio ya akaunti kuwa ni sahihi."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Imeshindwa kuunganisha kwenye seva kwa usalama."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Udhibiti wa usalama kutoka mbali"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Seva ya <xliff:g id="SERVER">%s</xliff:g> inahitaji uiruhusu idhibiti kwa umbali baadhi ya vipengele vya usalama vya simu yako. Ungependa kumaliza kufungua akaunti hii?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Seva hii inahitaji vipengele vya usalama ambavyo kifaa chako cha Android haiauni, ikijumlisha: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Huwezi kubadilisha jina la mtumiaji la akaunti. Ili kuongeza akaunti na jina tofauti la mtumiaji, gusa Ongeza Akaunti."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ILANI: Kuamilishua kibali cha programu ya Barua pepe ili kudhibiti kifaa chako itafuta akaunti zote za Barua pepe ambazo zinakihitaji, pamoja na barua pepe zake, anwani, matukio ya kalenda, na data nyingine."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Masasisho ya usalama"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> inahitaji usasishe mipangilio yako ya usalama."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Nenosiri la kufunga skrini limekwisha muda"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Data ya <xliff:g id="ACCOUNT">%s</xliff:g> inafutwa kutoka kwenye kifaa chako. Unaweza kuirejesha kwa kubadilisha PIN au nenosiri lako la kifungio skrini. Unataka kuibadilisha sasa?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Tupa mabadiliko yasiyohifadhiwa?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Haingeweza kuinga ndani"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Jina la mtumiaji au nenosiri la <xliff:g id="ACCOUNT">%s</xliff:g> sio sahihi. Je, unataka kusasisha sasa hivi?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Kuingia kwako kwenye <xliff:g id="ACCOUNT">%s</xliff:g> kumeshindikana; seva imesema: <xliff:g id="REASON">%s</xliff:g> Je, ungependa kusasisha jina lako la mtumiaji na/au nenosiri?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Pakua viambatisho"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Pakua kiotomatiki, kupitia Wi-Fi, viambatisho vya barua pepe zilizotumwa hivi karibuni"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Arifa za barua pepe"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sawazisha tukio lililo kwenye kalenda la akaunti hii"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sawazisha barua pepe"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sawazisha barua pepe za akaunti hii"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Mtetemo"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Tetema"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Chagua toni ya mlio"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Mipangilio ya seva"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Chaguo za kusawazisha"</string>
@@ -219,6 +261,12 @@
     <string name="system_account_create_failed" msgid="2248313263003927725">"Haikuweza kufungua akaunti. Jaribu tena."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Barua pepe"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Huwezesha sera za usalama zinazobainishwa na seva"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Mipangilio"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Mipangilio ya kawaida"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Thibitisha kabla ya kufuta"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Thibitisha kabla ya kutuma"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Tafuta katika barua pepe"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Usiruhusu matumizi ya kamera ya kifaa"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Zinahitaji nenosiri la kifaa"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Zuia kutumia tena manenosiri ya hivi karibuni"</string>
@@ -230,13 +278,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Nakubali!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Nitaisoma baadaye kisha nikujibu."</string>
     <string name="quick_4" msgid="216066940197616025">"Tupange mkutano wa kujadili haya."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Usawazishaji wa chinichini wa akaunti hii imezimwa wakati uko nje ya mtandao wako wa kawaida."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Inatuma mwitikio…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Ya binafsi (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Ya binafsi (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Hakuna barua pepe."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Kichukuaji folda"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Chagua folda ya taka ya seva kwa ajili ya <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Chagua folda ya seva ya vipengee vilivyotumwa vya <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Inapakia orodha ya folda…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Hakuna yanayopatikana"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Mipangilio ya kusawazisha folda"</string>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
deleted file mode 100644
index e92e485..0000000
--- a/res/values-ta-rIN/strings.xml
+++ /dev/null
@@ -1,296 +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">"மின்னஞ்சல் இணைப்புகளைப் படி"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"உங்கள் மின்னஞ்சல் இணைப்புகளைப் படிக்க பயன்பாட்டை அனுமதிக்கிறது."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"மின்னஞ்சல் வழங்குநர் தரவை அணுகு"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"பெறப்பட்ட மற்றும் அனுப்பிய செய்திகள், பயனர்பெயர்கள், கடவுச்சொற்கள் ஆகியவை உள்ளடங்கிய உங்கள் மின்னஞ்சல் தரவுத்தளத்தை அணுக பயன்பாட்டை அனுமதிக்கிறது."</string>
-    <string name="app_name" msgid="2206468539066258195">"மின்னஞ்சல்"</string>
-    <string name="debug_title" msgid="1337476992195531309">"பிழைத்திருத்துக"</string>
-    <string name="create_action" msgid="6575946089819721958">"புதியதை உருவாக்கு"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"விரைவு பதில்கள் இல்லை."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"கணக்கு அமைப்புகள்"</string>
-    <string name="status_network_error" msgid="526826323872477973">"இணைப்புப் பிழை."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"செய்தியை நகர்த்து"</item>
-    <item quantity="other" msgid="5083310421670206821">"செய்திகளை நகர்த்து"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 கணக்குகளில் நகர்த்துதல் ஆதரிக்கப்படவில்லை."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"பல கணக்குகளைத் தேர்வுசெய்துள்ளதால் செய்திகளை நகர்த்த முடியவில்லை."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"வரைவுகள், அவுட்பாக்ஸ் மற்றும் அனுப்பியவை ஆகிய கோப்புறைகளில் உள்ள செய்திகளை நகர்த்த முடியாது."</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"இன்பாக்ஸ்"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"அவுட்பாக்ஸ்"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"வரைவுகள்"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"நீக்கப்பட்டவை"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"அனுப்பியவை"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"தேவையற்றவை"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"நட்சத்திரமிட்டது"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"படிக்காதவை"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"இன்பாக்ஸ்"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"நட்சத்திரமிட்டது"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"வரைவுகள்"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"அவுட்பாக்ஸ்"</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>\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>
-    <string name="attachment_not_found" msgid="5219773045406833000">"இணைப்பைப் பதிவிறக்க முடியவில்லை."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"செய்தியைக் குறிவிலக்கும்போது பிழை ஏற்பட்டது."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"ஒன்று அல்லது அதற்கு மேற்பட்ட இணைப்புகளை முன்னனுப்ப முடியவில்லை."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"இணைப்பு முன்னனுப்பப்படவில்லை"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> இல் உள்நுழைவதில் தோல்வி."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"உள்நுழைய முடியவில்லை"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>பை."</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>பை."</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>கி.பை."</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>கி.பை."</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>மெ.பை."</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>மெ.பை."</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>ஜி.பை."</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>ஜி.பை."</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"கணக்கு அமைவு"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"அங்கீகரிப்பைக் கோருகிறது"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"உள்நுழைக"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"அங்கீகரிக்க முடியவில்லை"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"மின்னஞ்சல் முகவரி அல்லது கடவுச்சொல் தவறாக உள்ளது"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"மின்னஞ்சல் முகவரி:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"மின்னஞ்சல் கணக்கு"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"சில படிமுறைகளிலேயே உங்கள் கணக்கை அமைக்கலாம்."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"மின்னஞ்சல் முகவரி"</string>
-    <string name="or_label" msgid="6408695162723653446">"அல்லது"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google மூலம் உள்நுழை"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"கடவுச்சொல்"</string>
-    <string name="password_hint" msgid="4226682910292828279">"கடவுச்சொல்"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%s மூலம் உள்நுழைந்தீர்கள்"</string>
-    <string name="authentication_label" msgid="914463525214987772">"அங்கீகாரம்"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"அங்கீகரிப்பைச் சேர்"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"அங்கீகரிப்பை அழி"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"கைமுறை அமைவு"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"சரியான மின்னஞ்சல் முகவரி மற்றும் கடவுச்சொல்லை உள்ளிடவும்."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"நகல் கணக்கு"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"நீங்கள் \"<xliff:g id="DUPLICATE">%s</xliff:g>\" கணக்கிற்காக இந்தப் பயனர்பெயரை ஏற்கனவே பயன்படுத்துகிறீர்கள்."</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"இந்தக் கடவுச்சொல் ஒன்று அல்லது அதற்கு மேற்பட்ட இடைவெளி எழுத்துக்குறிகளுடன் தொடங்குகிறது அல்லது முடிகிறது. இடைவெளிகளுடன் கூடிய கடவுச்சொல்லைப் பல சேவையகங்கள் ஆதரிப்பதில்லை."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"கணக்குத் தகவலை மீட்டெடுக்கிறது…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"சேவையக அமைப்புகளைச் சரிபார்க்கிறது…"</string>
-    <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="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_title" msgid="8780121351085082269">"கணக்கு அமைவு"</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>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"இந்தப் புலம் வெறுமையாக இருக்கக் கூடாது."</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"கணக்கு அமைவு"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"கணக்கின் வகை"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"இது எவ்வகையான கணக்கு?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"கணக்கு அமைவு"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"உள்வரும் சேவையக அமைப்புகள்"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"பயனர்பெயர்"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"கடவுச்சொல்"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"கடவுச்சொல்"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"சேவையகம்"</string>
-    <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_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>
-    <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_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>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"கணக்கு அமைவு"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"வெளிச்செல்லும் சேவையக அமைப்புகள்"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP சர்வர்"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"போர்ட்"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"பாதுகாப்பு வகை"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"உள்நுழைவு தேவை"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"பயனர்பெயர்"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"கடவுச்சொல்"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"கிளையன்ட் சான்றிதழ்"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"தேர்ந்தெடு"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"கிளையண்ட் சான்றிதழைப் பயன்படுத்து"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"அகற்று"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"ஏதுமில்லை"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"மொபைல் சாதன ஐடி"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"கணக்கு அமைப்புகள்"</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_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>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"ஒவ்வொரு 15 நிமிடங்களுக்கும்"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"ஒவ்வொரு 30 நிமிடங்களுக்கும்"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"ஒவ்வொரு மணிநேரமும்"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"மின்னஞ்சல் வரும்போது எனக்குத் தெரிவி"</string>
-    <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_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>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"இறுதி நாள்"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"கடந்த மூன்று நாட்கள்"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"கடந்த வாரம்"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"கடந்த இரண்டு வாரங்கள்"</string>
-    <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_fmt" msgid="8811464534757505457">"உள்நுழைவு தோல்வியடைந்தது.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"சேவையகத்துடன் பாதுகாப்பாக இணைக்க முடியவில்லை.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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_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>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"சேவையகத்துடனான இணைப்பைத் திறக்க முடியவில்லை."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"நீங்கள் தவறான சேவையக முகவரியை உள்ளிட்டுள்ளீர்கள் அல்லது மின்னஞ்சல் ஆதரிக்காத நெறிமுறைப் பதிப்பைச் சேவையகம் கோருகிறது."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"இந்தச் சேவையகத்துடன் ஒத்திசைக்க உங்களுக்கு அனுமதியில்லை. மேலும் தகவலுக்கு உங்கள் சேவையகத்தின் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"தொலைநிலை பாதுகாப்பு நிர்வாகம்"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"உங்கள் Android சாதனத்தின் சில பாதுகாப்பு அம்சங்களை <xliff:g id="SERVER">%s</xliff:g> சேவையகம் தொலைநிலையில் கட்டுப்படுத்த உங்களை அனுமதிக்கக் கேட்கிறது. இந்தக் கணக்கை அமைத்து முடிக்க விரும்புகிறீர்களா?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"உங்கள் Android சாதனத்தால் ஆதரிக்கப்படாத பாதுகாப்பு அம்சங்கள் இந்தச் சேவையகத்திற்குத் தேவை, இதில் அடங்குபவை: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"கணக்கின் பயனர்பெயரை உங்களால் மாற்ற முடியாது. வேறு பயனர்பெயர் மூலம் கணக்கைச் சேர்க்க, கணக்கைச் சேர் என்பதைத் தொடவும்."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"எச்சரிக்கை: உங்கள் சாதனத்தை நிர்வகிப்பதற்கான மின்னஞ்சல் பயன்பாட்டின் அதிகாரத்தை முடக்குவது, அந்தப் பயன்பாடு தேவைப்படும் எல்லா மின்னஞ்சல் கணக்குகளையும், அவற்றின் மின்னஞ்சல், தொடர்புகள், கேலெண்டர் நிகழ்வுகள் மற்றும் பிற தரவு ஆகிய அனைத்தையும் நீக்கிவிடும்."</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_change_title" msgid="615639963487448183">"பாதுகாப்பு கொள்கைகள் மாற்றப்பட்டன"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"பாதுகாப்பு கொள்கைகளை அடைய முடியவில்லை"</string>
-    <string name="account_security_title" msgid="6072273231606918870">"சாதனப் பாதுகாப்பு"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="2527501853520160827">"உங்கள் Android சாதனத்தின் சில பாதுகாப்பு அம்சங்களை தொலைநிலையில் கட்டுப்படுத்த <xliff:g id="SERVER">%s</xliff:g> சேவையகத்துக்கு உங்கள் அனுமதி தேவைப்படுகிறது."</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>\" க்கு உங்கள் பூட்டுத் திரை PIN அல்லது கடவுச்சொல்லை மாற்ற வேண்டும்."</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"பூட்டுத் திரை கடவுச்சொல் காலாவதியாகிறது"</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">"உங்கள் பூட்டுத் திரை 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> க்கான தரவு அழிக்கப்படுகிறது. உங்கள் பூட்டுத் திரை PIN அல்லது கடவுச்சொல்லை மாற்றுவதன் மூலம் அதை மீட்டெடுக்கலாம். அதை இப்போது மாற்ற விரும்புகிறீர்களா?"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"சேமிக்கப்படாத மாற்றங்களை நிராகரிக்கவா?"</string>
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"உள்நுழைய முடியவில்லை"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> க்கான பயனர்பெயர் அல்லது கடவுச்சொல் தவறானது. இப்போது அவற்றைப் புதுப்பிக்க விரும்புகிறீர்களா?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"<xliff:g id="ACCOUNT">%s</xliff:g> இல் உங்கள் உள்நுழைவு தோல்வியடைந்தது; சேவையகம் பின்வரும் காரணத்தைக் கூறியது: <xliff:g id="REASON">%s</xliff:g> உங்கள் பயனர்பெயர் மற்றும்/அல்லது கடவுச்சொல்லைப் புதுப்பிக்க விரும்புகிறீர்களா?"</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_notify_label" msgid="8621226576645167987">"மின்னஞ்சல் அறிவிப்புகள்"</string>
-    <string name="account_settings_summary" msgid="4733776978291376161">"ஒத்திசைவின் கால இடைவெளி, அறிவிப்புகள், முதலியன"</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"மின்னஞ்சல் வரும்போது அறிவிக்கவும்"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"ஒத்திசைவின் கால இடைவெளி"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"உள்வரும் செய்திகளின் அமைப்புகள்"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"பயனர்பெயர், கடவுச்சொல் மற்றும் பிற உள்வரும் சேவையக அமைப்புகள்"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"வெளிச்செல்லும் செய்திகளின் அமைப்புகள்"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"பயனர்பெயர், கடவுச்சொல் மற்றும் பிற வெளிசெல்லும் சேவையக அமைப்புகள்"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"கொள்கைகள் செயல்படுத்தப்பட்டன"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"ஏதுமில்லை"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"ஆதரிக்கப்படாத கொள்கைகள்"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"எதுவுமில்லை"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"ஒத்திசைக்க முயற்சிசெய்"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"இந்தக் கணக்கை ஒத்திசைக்க இங்கே தொடவும்"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"கணக்கின் பெயர்"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"உங்கள் பெயர்"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"விரைவு பதில்கள்"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"மின்னஞ்சலை எழுதும்போது நீங்கள் அடிக்கடி செருகும் உரையைத் திருத்தவும்"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"அறிவிப்பு அமைப்புகள்"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"தரவு பயன்பாடு"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"பாதுகாப்பு கொள்கைகள்"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"முறைமை கோப்புகள்"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"குப்பை கோப்புறை"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"உங்கள் சேவையகத்தின் குப்பை கோப்புறையைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"உங்கள் சேவையகத்தின் குப்பை கோப்புறையைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"அனுப்பிய உருப்படிகள் கோப்புறை"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"உங்கள் சேவையகத்தின் அனுப்பிய உருப்படிகள் கோப்புறையைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"உங்கள் சேவையகத்தின் அனுப்பிய உருப்படிகள் கோப்புறையைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"விரைவு பதில்"</string>
-    <string name="save_action" msgid="5740359453077441466">"சேமி"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"தொடர்புகளை ஒத்திசை"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"இந்தக் கணக்கின் தொடர்புகளை ஒத்திசை"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"கேலெண்டரை ஒத்திசை"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"இந்தக் கணக்கிற்கான கேலெண்டர் நிகழ்வை ஒத்திசை"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"மின்னஞ்சலை ஒத்திசை"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"இந்த கணக்கிற்கான மின்னஞ்சலை ஒத்திசை"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"அதிர்வு"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"ரிங்டோனைத் தேர்வுசெய்"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"சேவையக அமைப்புகள்"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"ஒத்திசைவு விருப்பங்கள்"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"ஒத்திசைவு விருப்பங்கள் (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"இந்தக் கோப்புறையை ஒத்திசை"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"இணைக்கப்படும்போது செய்திகள் பதிவிறக்கப்படும்"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"அஞ்சலை ஒத்திசைப்பதற்கான நாட்கள்"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"அனுப்புநரின் படம்"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"இந்த நிரலை இணைக்க அனுமதிக்கும் POP அணுகல், சில \"Plus\" கணக்குகளில் மட்டுமே இருக்கும். உங்கள் சரியான மின்னஞ்சல் முகவரி மற்றும் கடவுச்சொல் மூலம் உள்நுழைய முடியவில்லையெனில், உங்களிடம் கட்டணம் செலுத்தப்பட்ட \"Plus\" கணக்கு இல்லாமல் இருக்கலாம். இந்த மின்னஞ்சல் கணக்குகளுக்கான அணுகலைப் பெற இணைய உலாவியைத் திறக்கவும்."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"இந்த மின்னஞ்சல் கணக்கை அமைக்கும் முன்பு, T-ஆன்லைன் இணையதளத்தைப் பார்வையிட்டு, POP3 மின்னஞ்சல் அணுகலுக்கான கடவுச்சொல்லை உருவாக்கவும்."</string>
-    <string name="exchange_name" msgid="3793803477985438102">"பெருநிறுவனம்"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"கணக்கை உருவாக்க முடியவில்லை. மீண்டும் முயற்சிக்கவும்."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"மின்னஞ்சல்"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"சேவையகம் சார்ந்த பாதுகாப்பு கொள்கைகளை இயக்குகிறது"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"அமைப்புகள்"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"பொது அமைப்புகள்"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"நீக்கும் முன்பு உறுதிசெய்"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"அனுப்பும் முன் உறுதிசெய்க"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"மின்னஞ்சலில் தேடு"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"சாதனத்தின் கேமராவைப் பயன்படுத்த அனுமதிக்க வேண்டாம்"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"சாதனக் கடவுச்சொல்லைக் கோரு"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"சமீபத்திய கடவுச்சொற்களின் மறுபயன்பாட்டை கட்டுப்படுத்து"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"கடவுச்சொற்களைக் காலாவதியாக்கக் கோரு"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"திரை பூட்டப்படுவதற்கு முன்பு, சாதனம் செயல்படாமல் இருக்க வேண்டிய நேரத்தைக் கோரு"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"ஒத்திசைக்கப்பட்ட கேலெண்டர் நிகழ்வுகளின் எண்ணிக்கையைக் கட்டுப்படுத்து"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"ஒத்திசைக்கப்பட்ட மின்னஞ்சல்களின் எண்ணிக்கையைக் கட்டுப்படுத்து"</string>
-    <string name="quick_1" msgid="9130521670178673190">"நன்றி!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"எனக்கு ஏற்றது போல் தெரிகிறதே!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"இதைப் பின்னர் படித்து, உங்களைத் தொடர்புகொள்கிறேன்."</string>
-    <string name="quick_4" msgid="216066940197616025">"இதை விவாதிக்க சந்திப்பை அமைப்பொம்."</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"ரோமிங்கில் இருக்கும்போது இந்தக் கணக்கிற்கான பின்புல ஒத்திசைவு முடக்கப்பட்டுள்ளது."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"பதிலை அனுப்புகிறது..."</string>
-    <string name="no_conversations" msgid="3785854971159919343">"செய்திகள் இல்லை."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"கோப்புறை தேர்ந்தெடுப்பான்"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> க்கு சேவையக குப்பை கோப்புறையைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> க்கு, சேவையக அனுப்பிய உருப்படிகள் கோப்புறையை தேர்ந்தெடுக்கவும்"</string>
-    <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>
-</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
deleted file mode 100644
index 0b643f4..0000000
--- a/res/values-te-rIN/strings.xml
+++ /dev/null
@@ -1,296 +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">"ఇమెయిల్ జోడింపులను చదవడం"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"మీ ఇమెయిల్ జోడింపులను చదవడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"ఇమెయిల్ ప్రదాత డేటాను ప్రాప్యత చేయడం"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"స్వీకరించిన సందేశాలు, పంపిన సందేశాలు, వినియోగదారు పేర్లు మరియు పాస్‌వర్డ్‌లతో సహా మీ ఇమెయిల్ డేటాబేస్‌ను ప్రాప్యత చేయడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
-    <string name="app_name" msgid="2206468539066258195">"ఇమెయిల్"</string>
-    <string name="debug_title" msgid="1337476992195531309">"డీబగ్"</string>
-    <string name="create_action" msgid="6575946089819721958">"కొత్తదాన్ని సృష్టించు"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"శీఘ్ర ప్రతిస్పందనలు ఏవీ లేవు."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"ఖాతా సెట్టింగ్‌లు"</string>
-    <string name="status_network_error" msgid="526826323872477973">"కనెక్షన్ సమస్య."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"సందేశాన్ని తరలించండి"</item>
-    <item quantity="other" msgid="5083310421670206821">"సందేశాలను తరలించండి"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 ఖాతాల్లో తరలింపుకి మద్దతు లేదు."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"ఎంపిక బహుళ ఖాతాలను కలిగి ఉన్నందున తరలింపు కుదరదు."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"చిత్తుప్రతులు, అవుట్‌బాక్స్‌ మరియు పంపబడినవిలోని సందేశాలు తరలించబడవు."</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"ఇన్‌బాక్స్"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"అవుట్‌బాక్స్"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"చిత్తుప్రతులు"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"ట్రాష్"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"పంపినవి"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"వ్యర్థం"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"నక్షత్రం గుర్తు ఉన్నవి"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"చదవనివి"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"ఇన్‌బాక్స్"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"నక్షత్రం గుర్తు ఉంచినవి"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"చిత్తుప్రతులు"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"అవుట్‌బాక్స్"</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>\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>
-    <string name="attachment_not_found" msgid="5219773045406833000">"జోడింపును డౌన్‌లోడ్ చేయడం సాధ్యపడలేదు."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"సందేశాన్ని డీకోడ్ చేస్తున్నప్పుడు లోపం ఏర్పడింది."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"ఒకటి లేదా అంతకంటే ఎక్కువ జోడింపులను ఫార్వార్డ్ చేయడం సాధ్యపడలేదు."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"జోడింపు ఫార్వార్డ్ చేయబడలేదు"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> సైన్ ఇన్ విఫలమైంది."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"సైన్ ఇన్ చేయడం సాధ్యపడలేదు"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"ఖాతా సెటప్"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"ప్రామాణీకరణను అభ్యర్థిస్తోంది"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"సైన్ ఇన్ చేయండి"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"ప్రామాణీకరించడం సాధ్యపడలేదు"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"ఇమెయిల్ చిరునామా లేదా పాస్‌వర్డ్ చెల్లదు"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"ఇమెయిల్ చిరునామా:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"ఇమెయిల్ ఖాతా"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"మీరు కేవలం కొన్ని దశల్లో మీ ఖాతాను సెటప్ చేయవచ్చు."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"ఇమెయిల్ చిరునామా"</string>
-    <string name="or_label" msgid="6408695162723653446">"లేదా"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Googleతో సైన్ ఇన్ చేయండి"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"పాస్‌వర్డ్"</string>
-    <string name="password_hint" msgid="4226682910292828279">"పాస్‌వర్డ్"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"%sతో సైన్ ఇన్ చేసారు"</string>
-    <string name="authentication_label" msgid="914463525214987772">"ప్రామాణీకరణ"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"ప్రామాణీకరణను జోడించండి"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"ప్రామాణీకరణను క్లియర్ చేయి"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"మాన్యువల్‌ సెటప్"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"చెల్లుబాటు అయ్యే ఇమెయిల్ చిరునామా మరియు పాస్‌వర్డ్‌ను టైప్ చేయండి."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"నకిలీ ఖాతా"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"మీరు ఇప్పటికే \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ఖాతా కోసం ఈ వినియోగదారు పేరుని ఉపయోగిస్తున్నారు."</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"ఈ పాస్‌వర్డ్ ఒకటి లేదా అంతకంటే ఎక్కువ ఖాళీ అక్షరాలతో ప్రారంభమవుతోంది లేదా ముగుస్తోంది. చాలా సర్వర్‌లు ఖాళీలతో ఉండే పాస్‌వర్డ్‌లకు మద్దతు ఇవ్వవు."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"ఖాతా సమాచారాన్ని పునరుద్ధరిస్తోంది…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"సర్వర్ సెట్టింగ్‌లను ప్రామాణీకరిస్తోంది…"</string>
-    <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_names_title" msgid="8780121351085082269">"ఖాతా సెటప్"</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>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"ఈ ఫీల్డ్‌ను ఖాళీగా వదిలిపెట్టకూడదు."</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"ఖాతా సెటప్"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"ఖాతా రకం"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"ఇది ఏ రకమైన ఖాతా?"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"ఖాతా సెటప్"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"ఇన్‌కమింగ్ సర్వర్ సెట్టింగ్‌లు"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"వినియోగదారు పేరు"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"పాస్‌వర్డ్"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"పాస్‌వర్డ్"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"సర్వర్"</string>
-    <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_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">"TLS ప్రారంభించు"</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_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>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"ఖాతా సెటప్"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"అవుట్‌గోయింగ్ సర్వర్ సెట్టింగ్‌లు"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP సర్వర్"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"పోర్ట్"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"భద్రత రకం"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"సైన్ ఇన్ అవసరం"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"వినియోగదారు పేరు"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"పాస్‌వర్డ్"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"క్లయింట్ ప్రమాణపత్రం"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"ఎంచుకోండి"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"క్లయింట్ ప్రమాణపత్రాన్ని ఉపయోగించు"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"తీసివేయి"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"ఏదీ వద్దు"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"మొబైల్ పరికరం ID"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"ఖాతా సెట్టింగ్‌లు"</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_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>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"ప్రతి 15 నిమిషాలకు"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"ప్రతి 30 నిమిషాలకు"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"ప్రతి గంట"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"ఇమెయిల్ వచ్చినప్పుడు నాకు తెలియజేయి"</string>
-    <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">"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>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"చివరి రోజు"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"గత మూడు రోజులు"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"గత వారం"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"గత రెండు వారాలు"</string>
-    <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_fmt" msgid="8811464534757505457">"లాగిన్ విఫలమైంది.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"సర్వర్‌కు సురక్షితంగా కనెక్ట్ చేయడం కుదరదు.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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_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>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"సర్వర్‌కు కనెక్షన్‌ను తెరవడం సాధ్యపడలేదు."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"మీరు చెల్లని సర్వర్ చిరునామాను నమోదు చేసారు లేదా ఇమెయిల్‌ మద్దతివ్వని ప్రోటోకాల్ సంస్కరణ సర్వర్‌కి అవసరం."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"ఈ సర్వర్‌తో సమకాలీకరించడానికి మీకు అనుమతి లేదు. మరింత సమాచారం కోసం మీ సర్వర్ నిర్వాహకుడిని సంప్రదించండి."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"రిమోట్ భద్రతా నిర్వహణ"</string>
-    <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"మీరు ఖాతా యొక్క వినియోగదారు పేరుని మార్చలేరు. వేరే వినియోగదారు పేరుతో ఖాతాను జోడించడానికి, ఖాతాను జోడించు తాకండి."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"హెచ్చరిక: మీ పరికరాన్ని నిర్వహించడానికి ఇమెయిల్ అనువర్తనానికి గల అధికారాన్ని నిష్క్రియం చేయడం వలన అది అవసరమయ్యే అన్ని ఇమెయిల్ ఖాతాలు అలాగే వాటి ఇమెయిల్, పరిచయాలు, క్యాలెండర్ ఈవెంట్‌లు మరియు ఇతర డేటా తొలగించబడతాయి."</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_change_title" msgid="615639963487448183">"భద్రతా విధానాలు మార్చబడ్డాయి"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"భద్రతా విధానాలకు అనుకూలంగా లేదు"</string>
-    <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">"మీరు మీ లాక్ స్క్రీన్ PINను లేదా పాస్‌వర్డ్‌ను మార్చాలని \"<xliff:g id="ACCOUNT">%s</xliff:g>\" కోరుతోంది."</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"లాక్ స్క్రీన్ పాస్‌వర్డ్ గడువు ముగుస్తోంది"</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">"మీరు మీ లాక్ స్క్రీన్ 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>కి సంబంధించిన డేటా తొలగించబడుతోంది. మీరు మీ లాక్ స్క్రీన్ PINను లేదా పాస్‌వర్డ్‌ను మార్చడం ద్వారా దాన్ని పునరుద్ధరించవచ్చు. మీరు ఇప్పుడే దీన్ని మార్చాలనుకుంటున్నారా?"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"సేవ్ చేయని మార్పులను విస్మరించాలా?"</string>
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"సైన్ ఇన్ చేయడం సాధ్యపడలేదు"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g>కి సంబంధించిన వినియోగదారు పేరు లేదా పాస్‌వర్డ్ చెల్లదు. మీరు ఇప్పుడే వాటిని నవీకరించాలనుకుంటున్నారా?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"<xliff:g id="ACCOUNT">%s</xliff:g>కి సంబంధించిన మీ లాగిన్ విఫలమైంది; సర్వర్ ఇలా తెలిపింది: <xliff:g id="REASON">%s</xliff:g> మీరు మీ వినియోగదారు పేరు మరియు/లేదా పాస్‌వర్డ్‌ను నవీకరించాలనుకుంటున్నారా?"</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>
-    <string name="account_settings_summary" msgid="4733776978291376161">"సమకాలీకరణ తరచుదనం, నోటిఫికేషన్‌లు మొదలైనవి"</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"ఇమెయిల్ వచ్చినప్పుడు నోటిఫికేషన్‌ను పంపు"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"సమకాలీకరణ తరచుదనం"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"ఇన్‌కమింగ్ సెట్టింగ్‌లు"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"వినియోగదారు పేరు, పాస్‌వర్డ్ మరియు ఇతర ఇన్‌కమింగ్ సర్వర్ సెట్టింగ్‌లు"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"అవుట్‌గోయింగ్ సెట్టింగ్‌లు"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"వినియోగదారు పేరు, పాస్‌వర్డ్ మరియు ఇతర అవుట్‌గోయింగ్ సర్వర్ సెట్టింగ్‌లు"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"అమలు చేయబడిన విధానాలు"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"ఏదీ వద్దు"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"మద్దతు లేని విధానాలు"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"ఏదీ వద్దు"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"సమకాలీకరించడానికి ప్రయత్నించు"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"ఈ ఖాతాను సమకాలీకరించడానికి ఇక్కడ తాకండి"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"ఖాతా పేరు"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"మీ పేరు"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"శీఘ్ర ప్రతిస్పందనలు"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"మీరు ఇమెయిల్‌ను కంపోజ్ చేస్తున్నప్పుడు తరచుగా చొప్పించే వచనాన్ని సవరించండి"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"నోటిఫికేషన్ సెట్టింగ్‌లు"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"డేటా వినియోగం"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"భద్రతా విధానాలు"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"సిస్టమ్‌‌ ఫోల్డర్‌లు"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"ట్రాష్ ఫోల్డర్"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"మీ సర్వర్ యొక్క ట్రాష్ ఫోల్డర్‌ను ఎంచుకోండి"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"మీ సర్వర్ యొక్క ట్రాష్ ఫోల్డర్‌ను ఎంచుకోండి"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"పంపిన అంశాల ఫోల్డర్"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"మీ సర్వర్ యొక్క పంపిన అంశాల ఫోల్డర్‌ను ఎంచుకోండి"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"మీ సర్వర్ యొక్క పంపిన అంశాల ఫోల్డర్‌ను ఎంచుకోండి"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"శీఘ్ర ప్రతిస్పందన"</string>
-    <string name="save_action" msgid="5740359453077441466">"సేవ్ చేయి"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"పరిచయాలను సమకాలీకరించు"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"ఈ ఖాతా కోసం పరిచయాలను సమకాలీకరించు"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"క్యాలెండర్‌ను సమకాలీకరించు"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ఈ ఖాతా కోసం క్యాలెండర్ ఈవెంట్‌ను సమకాలీకరించు"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ఇమెయిల్‌ను సమకాలీకరించు"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ఈ ఖాతా కోసం ఇమెయిల్‌ను సమకాలీకరించు"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"వైబ్రేట్"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"రింగ్‌టోన్‌ను ఎంచుకోండి"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"సర్వర్ సెట్టింగ్‌లు"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"సమకాలీకరణ ఎంపికలు"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"సమకాలీకరణ ఎంపికలు (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"ఈ ఫోల్డర్‌ను సమకాలీకరించు"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"కనెక్ట్ చేసినప్పుడు సందేశాలు డౌన్‌లోడ్ చేయబడతాయి"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"మెయిల్‌ను సమకాలీకరించాల్సిన రోజులు"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"పంపినవారి చిత్రం"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"ఈ ప్రోగ్రామ్‌ను కనెక్ట్ చేయడానికి అనుమతించే POP ప్రాప్యత కొన్ని \"Plus\" ఖాతాలకు మాత్రమే ఉంది. మీరు మీ సరైన ఇమెయిల్ చిరునామా మరియు పాస్‌వర్డ్‌తో సైన్ ఇన్ చేయలేకపోతున్నారంటే, మీకు చెల్లింపు \"Plus\" ఖాతా ఉండి ఉండకపోవచ్చు. ఈ ఇమెయిల్ ఖాతాలకు ప్రాప్యతను పొందడానికి వెబ్ బ్రౌజర్‌ను ప్రారంభించండి."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"ఈ ఇమెయిల్ ఖాతాను సెటప్ చేయడానికి ముందు, T-ఆన్‌లైన్ వెబ్‌సైట్‌ను సందర్శించండి మరియు POP3 ఇమెయిల్ ప్రాప్యత కోసం పాస్‌వర్డ్‌ను సృష్టించండి."</string>
-    <string name="exchange_name" msgid="3793803477985438102">"కార్పొరేట్"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"ఖాతాను సృష్టించడం సాధ్యపడలేదు. మళ్లీ ప్రయత్నించండి."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"ఇమెయిల్"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"సర్వర్ నిర్దిష్ట భద్రతా విధానాలను ప్రారంభిస్తుంది"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"సెట్టింగ్‌లు"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"సాధారణ సెట్టింగ్‌లు"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"తొలగించడానికి ముందు నిర్ధారించబడాలి"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"పంపడానికి ముందు నిర్ధారించు"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"ఇమెయిల్‌ను శోధించండి"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"పరికర కెమెరా యొక్క ఉపయోగం అనుమతిని రద్దు చేయండి"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"పరికర పాస్‌వర్డ్ అవసరం"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"ఇటీవలి పాస్‌వర్డ్‌ల పునరుపయోగాన్ని పరిమితం చేయండి"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"పాస్‌వర్డ్‌లకు గడువు ముగింపు ఆవశ్యకం"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"స్క్రీన్ లాక్ చేయబడటానికి పరికరం నిష్క్రియంగా ఉండటం అవసరం"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"సమకాలీకరించిన క్యాలెండర్ ఈవెంట్‌ల సంఖ్యను పరిమితం చేయండి"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"సమకాలీకరించే ఇమెయిల్‌ల సంఖ్యను పరిమితం చేయండి"</string>
-    <string name="quick_1" msgid="9130521670178673190">"ధన్యవాదాలు!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"తక్షణం ప్రతిస్పందించడం బాగా ఉంది!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"నేను దీన్ని తర్వాత చదివి, మిమ్మల్ని సంప్రదిస్తాను."</string>
-    <string name="quick_4" msgid="216066940197616025">"దీని గురించి చర్చించేందుకు సమావేశాన్ని ఏర్పాటు చేద్దాం."</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"ఈ ఖాతా యొక్క నేపథ్య సమకాలీకరణ రోమింగ్‌లో ఉన్నప్పుడు నిలిపివేయబడుతుంది."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"ప్రతిస్పందనను పంపుతోంది…"</string>
-    <string name="no_conversations" msgid="3785854971159919343">"సందేశాలు లేవు."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"ఫోల్డర్ ఎంపిక"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> కోసం సర్వర్ ట్రాష్ ఫోల్డర్‌ను ఎంచుకోండి"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> కోసం సర్వర్ పంపిన అంశాల ఫోల్డర్‌ను ఎంచుకోండి"</string>
-    <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>
-</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 4807aef..800269a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"เข้าถึงข้อมูลผู้ให้บริการอีเมล"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"อนุญาตให้แอปพลิเคชันนี้เข้าถึงฐานข้อมูลอีเมลของคุณ ซึ่งรวมถึงข้อความที่ได้รับ ข้อความที่ส่ง ชื่อผู้ใช้ และรหัสผ่าน"</string>
     <string name="app_name" msgid="2206468539066258195">"อีเมล"</string>
+    <string name="debug_title" msgid="1337476992195531309">"ดีบัก"</string>
     <string name="create_action" msgid="6575946089819721958">"สร้างใหม่"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"ไม่มีคำตอบด่วน"</string>
     <string name="account_settings_action" msgid="589969653965674604">"การตั้งค่าบัญชี"</string>
+    <string name="status_network_error" msgid="526826323872477973">"ปัญหาการเชื่อมต่อ"</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"ย้ายข้อความ"</item>
+    <item quantity="other" msgid="5083310421670206821">"ย้ายข้อความ"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"การย้ายไม่สามารถทำได้บนบัญชีแบบ POP3"</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"ย้ายไม่ได้เนื่องจากข้อความที่เลือกมาจากหลายบัญชี"</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"ไม่สามารถย้ายข้อความในข้อความร่าง กล่องจดหมายออก และข้อความที่ส่งแล้วได้"</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"กล่องจดหมาย"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"กล่องจดหมายออก"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"ร่างจดหมาย"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"ขยะ"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"ติดดาว"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"ยังไม่อ่าน"</string>
-    <string name="debug_title" msgid="1337476992195531309">"ดีบัก"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"กล่องจดหมาย"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"ที่ติดดาว"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"ร่างจดหมาย"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"กล่องจดหมายออก"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"ไม่สามารถดาวน์โหลดไฟล์แนบ"</string>
     <string name="message_decode_error" msgid="91396461771444300">"เกิดข้อผิดพลาดขณะถอดรหัสข้อความ"</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"ไม่สามารถส่งต่อไฟล์แนบอย่างน้อยหนึ่งรายการ"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"ไม่ได้ส่งต่อเอกสารแนบ"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"ลงชื่อเข้าใช้ <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ไม่สำเร็จ"</string>
     <string name="login_failed_title" msgid="1737884069957090004">"ไม่สามารถลงชื่อเข้าใช้"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>ไบต์"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>ไบต์"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"การตั้งค่าบัญชี"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"กำลังขอสิทธิ์"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"ลงชื่อเข้าใช้"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"พิมพ์ที่อยู่อีเมลและรหัสผ่านที่ถูกต้อง"</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"บัญชีซ้ำ"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"คุณใช้ชื่อผู้ใช้นี้สำหรับบัญชี \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ไปแล้ว"</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"รหัสผ่านนี้เริ่มต้นหรือสิ้นสุดด้วยการเว้นวรรคอย่างน้อยหนึ่งตำแหน่ง เซิร์ฟเวอร์จำนวนมากไม่รองรับรหัสผ่านที่มีการเว้นวรรค"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"กำลังเรียกข้อมูลบัญชี..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"กำลังตรวจสอบการตั้งค่าเซิร์ฟเวอร์…"</string>
     <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_names_title" msgid="8780121351085082269">"การตั้งค่าบัญชี"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"ต้องกรอกข้อมูลในฟิลด์นี้"</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"การตั้งค่าบัญชี"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"ประเภทบัญชี"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"บัญชีนี้เป็นบัญชีประเภทใด"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"การตั้งค่าบัญชี"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"การตั้งค่าเซิร์ฟเวอร์ขาเข้า"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ชื่อผู้ใช้"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"รหัสผ่าน"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"การตั้งค่าบัญชี"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"การตั้งค่าเซิร์ฟเวอร์ขาออก"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"เซิร์ฟเวอร์ SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"พอร์ต"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ประเภทความปลอดภัย"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"จำเป็นต้องลงชื่อเข้าใช้"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ชื่อผู้ใช้"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"รหัสผ่าน"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"ใบรับรองไคลเอ็นต์"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"เลือก"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"ใช้ใบรับรองไคลเอ็นต์"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"ลบ"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"ไม่มี"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID อุปกรณ์เคลื่อนที่"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"การตั้งค่าบัญชี"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"การเข้าสู่ระบบล้มเหลว\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"การจัดการด้านความปลอดภัยจากระยะไกล"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"คุณไม่สามารถเปลี่ยนชื่อผู้ใช้ของบัญชีได้ หากต้องการเพิ่มบัญชีด้วยชื่อผู้ใช้อื่น ให้แตะ \"เพิ่มบัญชี\""</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"คำเตือน: การปิดใช้งานสิทธิ์ของแอปพลิเคชันอีเมลในการดูแลอุปกรณ์ของคุณจะเป็นการนำออกบัญชีอีเมลทั้งหมดที่จำเป็นต้องใช้สิทธิ์นั้น พร้อมทั้งอีเมล สมุดโทรศัพท์ กิจกรรมในปฏิทิน และข้อมูลอื่นๆ"</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>
@@ -168,6 +207,9 @@
     <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> กำลังถูกลบออกจากอุปกรณ์ของคุณ คุณสามารถคืนค่าข้อมูลได้โดยเปลี่ยน PIN หรือรหัสผ่านล็อกหน้าจอของคุณ เปลี่ยนรหัสตอนนี้หรือไม่"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"ยกเลิกการเปลี่ยนแปลงที่ยังไม่ได้บันทึกหรือไม่"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"ลงชื่อเข้าใช้ไม่ได้"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"ชื่อผู้ใช้หรือรหัสผ่านสำหรับ <xliff:g id="ACCOUNT">%s</xliff:g> ไม่ถูกต้อง คุณต้องการอัปเดตตอนนี้หรือไม่"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"การเข้าสู่ระบบ <xliff:g id="ACCOUNT">%s</xliff:g> ของคุณล้มเหลว เซิร์ฟเวอร์ถามว่า: <xliff:g id="REASON">%s</xliff:g> คุณต้องการอัปเดตชื่อผู้ใช้และ/หรือรหัสผ่านของคุณหรือไม่"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"ดาวน์โหลดไฟล์แนบ"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"ดาวน์โหลดไฟล์แนบของข้อความล่าสุดผ่าน WiFi โดยอัตโนมัติ"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"การแจ้งเตือนทางอีเมล"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ซิงค์กิจกรรมในปฏิทินสำหรับบัญชีนี้"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ซิงค์อีเมล"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ซิงค์อีเมลสำหรับบัญชีนี้"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"สั่น"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"สั่น"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"เลือกเสียงเรียกเข้า"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"การตั้งค่าเซิร์ฟเวอร์"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"ตัวเลือกการซิงค์"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"ซิงค์โฟลเดอร์นี้"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"ข้อความจะดาวน์โหลดเมื่อเชื่อมต่อ"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"จำนวนวันของอีเมลที่จะซิงค์"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"ภาพของผู้ส่ง"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"มีเพียงบัญชีแบบ \"Plus\" บางประเภทเท่านั้นที่มีการเข้าถึงแบบ POP ที่โปรแกรมสามารถเชื่อมต่อได้ หากคุณไม่สามารถลงชื่อเข้าใช้ด้วยที่อยู่อีเมลและรหัสผ่านที่ถูกต้องได้ อาจเป็นเพราะคุณไม่มีบัญชี \"Plus\" แบบเสียค่าใช้จ่าย โปรดเปิดเว็บเบราว์เซอร์เพื่อเข้าถึงบัญชีอีเมลเหล่านี้"</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"ก่อนที่จะตั้งค่าบัญชีอีเมลนี้ ให้ไปที่เว็บไซต์ T-Online และสร้างรหัสผ่านสำหรับการเข้าถึงอีเมลแบบ POP3"</string>
+    <string name="exchange_name" msgid="3793803477985438102">"องค์กร"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"ไม่สามารถสร้างบัญชี ลองอีกครั้ง"</string>
     <string name="device_admin_label" msgid="3335272972461391415">"อีเมล"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"เปิดการใช้งานนโยบายความปลอดภัยที่ระบุโดยเซิร์ฟเวอร์"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"การตั้งค่า"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"การตั้งค่าทั่วไป"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"ยืนยันก่อนลบ"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"ยืนยันก่อนส่ง"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"ค้นหาอีเมล"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"ไม่อนุญาตให้ใช้กล้องถ่ายรูปของอุปกรณ์"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"ต้องมีรหัสผ่านของอุปกรณ์"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"จำกัดการนำรหัสผ่านล่าสุดมาใช้ใหม่"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"น่าสนใจนะ!"</string>
     <string name="quick_3" msgid="8070999183033184986">"ฉันจะอ่านและตอบกลับทีหลัง"</string>
     <string name="quick_4" msgid="216066940197616025">"จัดการประชุมเพื่อคุยเรื่องนี้กัน"</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"การซิงค์พื้นหลังสำหรับบัญชีนี้ถูกปิดใช้งานขณะโรมมิ่ง"</string>
     <string name="confirm_response" msgid="6764021931370809514">"กำลังส่งการตอบกลับ…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"ส่วนตัว (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"ส่วนตัว (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"ไม่มีข้อความ"</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"เครื่องมือเลือกโฟลเดอร์"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"เลือกโฟลเดอร์ถังขยะของเซิร์ฟเวอร์สำหรับ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"เลือกโฟลเดอร์รายการที่ส่งของเซิร์ฟเวอร์สำหรับ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <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>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 40a81dc..6501151 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"I-access ang data ng provider ng email"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Binibigyang-daan ang application na i-access ang database ng iyong email, kabilang ang mga natanggap na mensahe, naipadalang mensahe, username, at password."</string>
     <string name="app_name" msgid="2206468539066258195">"Email"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Debug"</string>
     <string name="create_action" msgid="6575946089819721958">"Lumikha ng bago"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Walang mga mabilisang pagtugon."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Mga setting ng account"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Problema sa koneksyon."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Ilipat ang mensahe"</item>
+    <item quantity="other" msgid="5083310421670206821">"Ilipat ang mga mensahe"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Hindi sinusuportahan ang paglipat sa mga POP3 na account."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Hindi mailipat dahil naglalaman ng maramihang account ang pinili."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Hindi mailipat ang mga mensahe sa Mga Draft, Outbox, at Naipadala."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Inbox"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Outbox"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Mga Draft"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Basura"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"May Bituin"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Hindi pa nabasa"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Debug"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Inbox"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Naka-star"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Mga Draft"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Outbox"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Pinagsamang pagtingin"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Orihinal na Mensahe --------\nPaksa: <xliff:g id="SUBJECT">%1$s</xliff:g>\nMula kay: <xliff:g id="SENDER">%2$s</xliff:g>\nPara kay: <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">"Ipasok ang mabilisang tugon"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Ipasok ang mabilisang tugon"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Ida-download ang isa o higit pang mga attachment sa iyong ipinasang mensahe bago ang pagpapadala."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Hindi ma-download ang attachment."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Nagkaroon ng isang error habang dine-decode ang mensahe."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Hindi makapagpasa ng isa o higit pang mga attachment."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Hindi napasa ang attachment"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Hindi matagumpay ang pag-signin ng <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Hindi makapag-sign in"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Setup ng account"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Humihiling ng pahintulot"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Mag-sign in"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Mag-type ng wastong email address at password."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Duplicate na account"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Ginagamit mo na ang username na ito para sa account na \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Nagsisimula o nagtatapos ang password na ito na may isa o higit pang character na puwang. Hindi sinusuportahan ng maraming server ang mga password na may mga puwang."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Binabawi ang impormasyon ng account…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Pinapatunayan ang mga setting ng server…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Pinapatunayan ang mga setting ng smtp…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Nililikha ang account..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Kumpirmahin ang uri ng account"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Ipinahiwatig mo na ginagamit ng <xliff:g id="EMAIL">%1$s</xliff:g> ang <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, ngunit maaaring gamitin ng account ang <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Setup ng account"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Naka-set up na ang iyong account at paparating na ang email!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Bigyan ng pangalan ang account na ito (opsyonal)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Iyong pangalan (na ipinapakita sa mga papalabas na mensahe)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Hindi maaaring blangko ang field na ito."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Setup ng account"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Uri ng account"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Anong uri ng account ito?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Setup ng account"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Mga setting ng papasok na server"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"USERNAME"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"PASSWORD"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Kapag nagtanggal ako mula sa Inbox"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Prefix ng path ng IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Opsyonal"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Setup ng account"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Mga setting ng papalabas na server"</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">"URI NG SEGURIDAD"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Hingin ang pag-signin"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"USERNAME"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"PASSWORD"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CERTIFICATE NG CLIENT"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Piliin"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Gamitin ang certificate ng client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Alisin"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Wala"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBILE DEVICE ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Mga setting ng account"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Mga pagpipilian sa account"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Dalas ng pag-sync:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Hindi kailanman"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Lahat"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Gamitin account default"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Hindi tama ang username o password."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Nabigo ang login.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Problema sa pag-setup ng account"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Kumpirmahing tama ang username, password, at mga setting ng account."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Hindi makakonekta nang ligtas sa server."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Pangangasiwa ng remote na seguridad"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Kinakailangan ng server na <xliff:g id="SERVER">%s</xliff:g> na payagan mo itong malayuang kontrolin ang ilang tampok sa seguridad ng iyong Android device. Gusto mo bang tapusing i-set up ang account na ito?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Nangangailangan ang server na ito ng mga tampok sa seguridad na hindi sinusuportahan ng iyong Android device, kabilang ang: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Hindi mo maaaring baguhin ang username ng isang account. Para magdagdag ng isang account na may ibang username, pindutin ang Magdagdag ng Account."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"BABALA: Ang pag-deactivate sa awtoridad ng Email app na pangasiwaan ang iyong device ay magtatanggal sa lahat ng email account na nangangailangan nito, kasama ang email, mga contact, mga kaganapan sa kalendaryo, at iba pang data ng mga ito."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Update sa seguridad"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"Kinakailangan ng <xliff:g id="ACCOUNT">%s</xliff:g> na i-update mo ang iyong mga setting ng seguridad."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Nag-expire na password pag-lock screen"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Binubura ang data para sa <xliff:g id="ACCOUNT">%s</xliff:g> mula sa iyong device. Maipapanumbalik mo ito sa pamamagitan ng pagbabago sa iyong PIN o password para sa screen ng lock. Nais mo ba itong baguhin ngayon?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Itapon ang hindi naka-save na mga pagbabago?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Hindi makapag-sign in"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Hindi tama ang username o password para sa <xliff:g id="ACCOUNT">%s</xliff:g>. Nais mo bang i-update ang mga ito ngayon?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Nabigo ang iyong pag-log in sa <xliff:g id="ACCOUNT">%s</xliff:g>; nakalagay sa server: <xliff:g id="REASON">%s</xliff:g> Nais mo bang i-update ang iyong username at/o password?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Mag-download ng mga attachment"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Awto i-download mga attachment sa mga bagong mensahe sa Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Mga notification sa email"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"I-sync ang kalendaryo ng kaganapan para sa account"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"I-sync ang email"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"I-sync ang email sa account na ito"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"I-vibrate"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"I-vibrate"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Pumili ng ringtone"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Mga setting ng server"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Mga pagpipilian sa pag-sync"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"I-sync ang folder na ito"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Ida-download ang mga mensahe kapag nakakonekta"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Mga araw ng mail na isi-sync"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Larawan ng nagpadala"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Ilang mga \"Plus\" account lamang ang kinabibilangan ng access sa POP nag nagbibigay-daan sa program na ito na makakonekta. Kung hindi mo magawang mag-sign in gamit ang iyong tamang email address at password, maaaring wala kang may bayad na \"Plus\" account. Ilunsad ang web browser upang makakuha ng access sa mga email account na ito."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Bago i-set up ng email account na ito, bisitahin ang T-Online website at lumikha ng password para sa access sa POP3 email."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Corporate"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Hindi malikha ang account. Subukang muli."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Email"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Pinapagana ang mga patakaran sa seguridad na partikular sa server"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Mga Setting"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Mga pangkalahatang setting"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Kumpirmahin bago tanggalin"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Kumpirmahin bago ipadala"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Maghanap sa email"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Wag payag paggamit ng camera ng device"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Hilingin ang password ng device"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Paghigpitan gamit muli dating password"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Magaling sa akin!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Babasahin ko ito sa ibang pagkakataon at babalik sa iyo."</string>
     <string name="quick_4" msgid="216066940197616025">"Magtakda tayo ng pulong upang talakayin ito."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Hindi pinapagana ang background na pag-sync para sa account na ito habang nagro-roam."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Ipinapadala ang tugon…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Personal (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Personal (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Walang mga mensahe."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Picker ng folder"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Piliin server trash folder sa <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Piliin server sent items folder sa <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Nilo-load ang listahan ng folder…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Walang available"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Mga setting ng pag-sync sa folder"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5ead543..6e60bf5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"E-posta sağlayıcı verilerine eriş"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Uygulamaya, alınan iletiler, gönderilen iletiler, kullanıcı adları ve şifreler de dahil olmak üzere e-posta veritabanınıza erişme izni verir."</string>
     <string name="app_name" msgid="2206468539066258195">"E-posta"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Hata Ayıklama"</string>
     <string name="create_action" msgid="6575946089819721958">"Yeni oluştur"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Hızlı yanıt yok."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Hesap ayarları"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Bağlantı sorunu."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"İletiyi taşı"</item>
+    <item quantity="other" msgid="5083310421670206821">"İletileri taşı"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Taşıma işlemi POP3 hesaplarında desteklenmiyor."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Seçim birden fazla hesap içerdiğinden taşınamıyor."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Taslaklar, Giden Kutusu ve Gönderilenler\'deki iletiler taşınamaz."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Gelen Kutusu"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Giden Kutusu"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Taslaklar"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Önemsiz"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Yıldızlı"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Okunmamış"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Hata Ayıklama"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Gelen Kutusu"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Yıldızlı"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Taslaklar"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Giden Kutusu"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Birleşik görünüm"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Orijinal İleti --------\nKonu: <xliff:g id="SUBJECT">%1$s</xliff:g>\nGönderen: <xliff:g id="SENDER">%2$s</xliff:g>\nAlıcı:<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">"Hızlı yanıt ekle"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Hızlı yanıt ekle"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Yönlendirilen iletinizdeki bir veya daha fazla ek, gönderme işleminden önce indirilecek."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Ek indirilemedi."</string>
     <string name="message_decode_error" msgid="91396461771444300">"İletinin kodu çözülürken bir hata oluştu."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Bir veya birden fazla ek yönlendirilemedi."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Ek yönlendirilmedi"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> oturumu açılamadı."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Oturum açılamadı"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Hesap kurulumu"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Yetkilendirme isteniyor"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Oturum açın"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Geçerli bir e-posta adresi ve şifre yazın."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Yinelenen hesap"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Bu kullanıcı adını \"<xliff:g id="DUPLICATE">%s</xliff:g>\" hesabı için zaten kullanıyorsunuz."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Şifre bir veya daha fazla boşluk karakteriyle başlıyor ya da bitiyor. Birçok sunucu boşluk içeren şifreleri desteklemez."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Hesap bilgileri alınıyor..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Sunucu ayarları doğrulanıyor…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"SMTP ayarları doğrulanıyor…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Hesap oluşturuluyor..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Hesap türünü onaylayın"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"<xliff:g id="EMAIL">%1$s</xliff:g> hesabının <xliff:g id="USERPROTOCOL">%2$s</xliff:g> protokolünü kullandığını belirttiniz, ancak hesap <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> protokolünü kullanabilir"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Hesap kurulumu"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Hesabınız ayarlandı ve e-posta gönderildi!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Bu hesaba bir ad ver (isteğe bağlı)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Adınız (giden iletilerde görüntülenir)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Bu alan boş olamaz."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Hesap kurulumu"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Hesap türü"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Bu hesabın türü nedir?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Hesap kurulumu"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Gelen sunucu ayarları"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"KULLANICI ADI"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ŞİFRE"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Gelen Kutusundan sildiğimde"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP yolu öneki"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"İsteğe bağlı"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Hesap kurulumu"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Giden sunucu ayarları"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP SUNUCUSU"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"BAĞLANTI NOKTASI"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"GÜVENLİK TÜRÜ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Oturum açmayı gerektir"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"KULLANICI ADI"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ŞİFRE"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"İSTEMCİ SERTİFİKASI"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Seç"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"İstemci sertifikası kullan"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Kaldır"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Yok"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBİL CİHAZ KİMLİĞİ"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Hesap ayarları"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Hesap seçenekleri"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Senkronizasyon sıklığı:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Hiçbir zaman"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Tümü"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Hesap varsayılanını kullan"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Kullanıcı adı veya şifre hatalı."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Giriş yapılamadı.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Hesap kurulumuyla ilgili sorun"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Kullanıcı adının, şifrenin ve hesap ayarlarının doğru olduğunu onaylayın."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Sunucuya güvenli biçimde bağlanılamıyor."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Uzaktan güvenlik yönetimi"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"<xliff:g id="SERVER">%s</xliff:g> sunucusu, Android cihazınızın bazı güvenlik özelliklerini uzaktan kontrol etmesine izin vermenizi gerektiriyor. Bu hesabı ayarlamayı tamamlamak istiyor musunuz?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Bu sunucu, Android cihazınız tarafından desteklenmeyen güvenlik özellikleri gerektiriyor, örneğin: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Bir hesabın kullanıcı adını değiştiremezsiniz. Farklı kullanıcı adıyla hesap eklemek için Hesap Ekle\'ye dokunun."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"UYARI: E-posta uygulamasının cihazınızı yönetme yetkisinin devre dışı bırakılması, bunu gerektiren tüm e-posta hesaplarının yanı sıra bu hesaplar ait e-postaları, kişileri, takvim olaylarını ve diğer verileri siler."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Güvenlik güncellemesi"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> için güvenlik ayarlarınızı güncellemeniz gerekiyor."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Ekran kilidi şifresinin süresi doldu"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"<xliff:g id="ACCOUNT">%s</xliff:g> hesabına ait veriler cihazınızdan siliniyor. Ekran kilidi PIN\'inizi veya şifrenizi değiştirerek bu verileri geri yükleyebilirsiniz. Bunu şimdi değiştirmek ister misiniz?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Kaydedilmeyen değişiklikler silinsin mi?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Oturum açılamadı."</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> için kullanıcı adı veya şifre yanlış. Bunları şimdi güncellemek ister misiniz?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"<xliff:g id="ACCOUNT">%s</xliff:g> hesabına giriş yapamadınız; sunucu şu yanıtı verdi: <xliff:g id="REASON">%s</xliff:g> Kullanıcı adınızı veya şifrenizi güncellemek ister misiniz?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Ekleri indir"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Son iletilerin eklerini Kablosuz üzerinden otomatik indir"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"E-posta bildirimleri"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Bu hesabın takvim etkinliğini senkronize et"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"E-postayı senk. et"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Bu hesaba ilişkin e-postaları senkronize et"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Titret"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Titreşim"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Zil sesi seçin"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Sunucu ayarları"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Senkronizasyon seçenekleri"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Bu klasörü senkronize et"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Bağlandığında iletiler indirilir"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Postanın senkronize edileceği gün sayısı"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Gönderen resmi"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Yalnızca bazı \"Plus\" hesapları bu programın bağlanmasına izin veren POP erişimi içerir. Doğru e-posta adresinizle ve şifrenizle oturum açamıyorsanız, ödemeli bir \"Plus\" hesabına sahip olmayabilirsiniz. Bu e-posta hesaplarına erişmek için web tarayıcıyı başlatın."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Bu e-posta hesabını ayarlamadan önce T-Online web sitesini ziyaret edin ve POP3 e-posta erişimi için bir şifre oluşturun."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Kurumsal"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Hesap oluşturulamadı. Tekrar deneyin."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"E-posta"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Sunucu tarafından belirlenen güvenlik politikalarını etkinleştirir"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Ayarlar"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Genel ayarlar"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Silmeden önce onayla"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Göndermeden önce onayla"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"E-postada ara"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Cihaz kamerasının kullanımına izin verme"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Cihaz şifresi gerektir"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Son şifrelerin tekrar kullanılmasını kısıtla"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Benim için uygun görünüyor!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Bunu daha sonra okuyup size geri döneceğim."</string>
     <string name="quick_4" msgid="216066940197616025">"Bu konuyu tartışmak üzere bir toplantı ayarlayalım."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Dolaşımdayken bu hesabın arka plan senkronizasyonu devre dışı bırakılır."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Yanıt gönderiliyor…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Kişisel (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Kişisel (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"İleti yok."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Klasör seçici"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> için sunucunun çöp kutusu klasörünü seçin"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> için sunucunun gönderilen öğeler klasörünü seçin"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Klasör listesi yükleniyor…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Hiçbiri kullanılamıyor"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Klasör senkronizasyon ayarları"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ec06d5b..251d123 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Доступ до даних постачальника послуг електронної пошти"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Дозволяє програмі отримувати доступ до бази даних вашої пошти, зокрема отриманих і надісланих повідомлень, імен користувачів та паролів."</string>
     <string name="app_name" msgid="2206468539066258195">"Ел.пошта"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Налагодж."</string>
     <string name="create_action" msgid="6575946089819721958">"Створити"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Швидких відповідей немає."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Налашт-ня обл. зап."</string>
+    <string name="status_network_error" msgid="526826323872477973">"Проблема зі з’єднанням."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Переміщення повідомлення"</item>
+    <item quantity="other" msgid="5083310421670206821">"Переміщення повідомлень"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Переміщення не підтримується в облікових записах POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Неможливо перемістити, оскільки вибрано декілька облікових записів."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Повідомлення в папках \"Чернетки\", \"Вихідні\" та \"Надіслані\" перемістити неможливо."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Вхідні"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Вихідні"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Чернетки"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Спам"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Із зірочкою"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Непрочитані"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Налагодж."</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Вхідні"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Із зіроч."</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Чернетки"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Вихідні"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Не вдалося завантажити вкладений файл."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Під час розшифрування повідомлення сталася помилка."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Не вдалося переслати один або кілька вкладених файлів."</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Вкладений файл не переслано"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Помилка входу в обліковий запис <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Не вдалося ввійти"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> Кб"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> Кб"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Мб"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Мб"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Гб"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Гб"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Налаштування облікового запису"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Запит на авторизацію"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Увійти"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Введіть дійсну електронну адресу та пароль."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Копія облікового запису"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Ви вже використовуєте це ім’я користувача для облікового запису \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Цей пароль починається чи закінчується одним або кількома символами пробілів. Багато серверів не підтримують паролі з пробілами."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Отримання інфо про облік. запис…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Перевірка налаштувань сервера…"</string>
     <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_names_title" msgid="8780121351085082269">"Налаштування облікового запису"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Це поле не може бути порожнім."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Налаштування облікового запису"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Тип облікового запису"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Тип облікового запису?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Налаштування облікового запису"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Параметри сервера вхідних повідомлень"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"ІМ’Я КОРИСТУВАЧА"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"ПАРОЛЬ"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Налаштування облікового запису"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Параметри сервера вихідних повідомлень"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP-СЕРВЕР"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"ПОРТ"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"ТИП ЗАХИСТУ"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Потрібно ввійти"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"ІМ’Я КОРИСТУВАЧА"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"ПАРОЛЬ"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"СЕРТИФІКАТ КЛІЄНТА"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Вибрати"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Використати сертифікат клієнта"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Видалити"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Немає"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ІДЕНТИФІКАТОР МОБІЛ. ПРИСТРОЮ"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Параметри облікового запису"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"Помилка входу.\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Віддалене керування безпекою"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"Ви не можете змінювати ім’я користувача облікового запису. Щоб додати обліковий запис з іншим іменем користувача, торкніться опції \"Додати обліковий запис\"."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ЗАСТЕРЕЖЕННЯ. Дезактивація повноважень програми електронної пошти на адміністрування вашого пристрою призведе до видалення всіх облікових записів електронної пошти, що потребують адміністрування, разом з їхніми електронними листами, контактами, подіями календаря й іншими даними."</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>
@@ -206,7 +245,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Синхроніз. календар із цим обл.зап."</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Синхроніз. ел.пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Синхрон. ел. пошту для обл. запису"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Вібросигнал"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Вібросигнал"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Вибрати сигнал дзвінка"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Налашт-ня сервера"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Параметри синхронізації"</string>
@@ -214,11 +253,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Синхронізувати цю папку"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Повідомлення завантажаться, коли з’явиться з’єднання"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Період синхронізації"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Зображення відправника"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Лише деякі облікові записи класу \"Plus\" надаються з доступом до сервера POP, що дозволяє цій програмі підключатися. Якщо ви не можете ввійти, використовуючи правильну електронну адресу та пароль, можливо, у вас немає платного облікового запису \"Plus\". Запустіть веб-переглядач, щоб мати доступ до цих облікових записів електронної пошти."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Перед налаштуванням цього облікового запису пошти відвідайте веб-сайт T-Online і створіть пароль для доступу до поштового сервера POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Корпоратив"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Не вдалося створити обліковий запис. Повторіть спробу."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Ел.пошта"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Активує правила безпеки, указані сервером"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Налаштування"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Загальні налаштування"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Підтвердити перед видаленням"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Підтвердити перед надсиланням"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Пошук в електронній пошті"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Забороняти використання камери пристрою"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Вимагати пароль пристрою"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Обмежувати повторне викор. остан.паролів"</string>
@@ -230,13 +278,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Мені підходить!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Я прочитаю це пізніше, а потім дам знати."</string>
     <string name="quick_4" msgid="216066940197616025">"Потрібно зустрітися, щоб це обговорити."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"У роумінгу фонову синхронізацію для цього облікового запису вимкнено."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Надсилання відповіді…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"Особистий (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Особистий (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Немає повідомлень."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Засіб вибору папки"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g>: виберіть \"Кошик\" на сервері"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g>: виберіть папку на сервері"</string>
     <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>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
deleted file mode 100644
index e66d5e2..0000000
--- a/res/values-ur-rPK/strings.xml
+++ /dev/null
@@ -1,296 +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">"ای میل کے منسلکات پڑھیں"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"ایپ کو آپ کے ای میل کے منسلکات پڑھنے کی اجازت دیتا ہے۔"</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"ای میل فراہم کنندہ کے ڈیٹا تک رسائی حاصل کریں"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"ایپ کو آپ کے ای میل ڈیٹابیس، بشمول موصولہ پیغامات، مرسلہ پیغامات، صارف نام اور پاس ورڈز تک رسائی حاصل کرنے کی اجازت دیتا ہے۔"</string>
-    <string name="app_name" msgid="2206468539066258195">"ای میل"</string>
-    <string name="debug_title" msgid="1337476992195531309">"ڈیبگ کریں"</string>
-    <string name="create_action" msgid="6575946089819721958">"نیا بنائیں"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"کوئی فوری جوابات نہیں ہیں۔"</string>
-    <string name="account_settings_action" msgid="589969653965674604">"اکاؤنٹ کی ترتیبات"</string>
-    <string name="status_network_error" msgid="526826323872477973">"کنکشن کا مسئلہ۔"</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"پیغام منتقل کریں"</item>
-    <item quantity="other" msgid="5083310421670206821">"پیغامات منتقل کریں"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"‏منتقلی POP3 اکاؤنٹس پر تعاون یافتہ نہیں ہے۔"</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"انتخاب متعدد اکاؤنٹس پر مشتمل ہونے کی وجہ سے منتقل نہیں ہوسکتے۔"</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"مسودے، آؤٹ باکس اور مرسلہ میں موجود پیغامات منتقل نہیں کیے جا سکتے ہیں۔"</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"ان باکس"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"آؤٹ باکس"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"مسودے"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"کوڑے دان"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"ارسال کردہ"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"فضول"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"ستارے کے نشان والا"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"بغیر پڑھے ہوئے"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"ان باکس"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"ستارے کے نشان لگا ہوا"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"مسودے"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"آؤٹ باکس"</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>\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>
-    <string name="attachment_not_found" msgid="5219773045406833000">"منسلکہ کو ڈاؤن لوڈ نہیں کرسکا۔"</string>
-    <string name="message_decode_error" msgid="91396461771444300">"پیغام کو ڈیکوڈ کرتے وقت ایک خرابی تھی۔"</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"ایک یا مزید منسلکات کو آگے فارورڈ نہیں کر سکے۔"</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"منسلکہ کو فارورڈ نہیں کیا گیا"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> سائن ان ناکام رہا۔"</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"سائن ان نہیں کر سکے"</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"اکاؤنٹ سیٹ اپ"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"اجازت طلب کر رہا ہے"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"سائن ان کریں"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"توثیق کرنے سے قاصر"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"ای میل پتہ یا پاس ورڈ غلط ہیں"</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"ای میل پتہ:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"ای میل اکاؤنٹ"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"آپ صرف چند مراحل میں اپنا اکاؤنٹ سیٹ اپ کر سکتے ہیں۔"</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"ای میل پتہ"</string>
-    <string name="or_label" msgid="6408695162723653446">"یا"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"‏Google کے ساتھ سائن ان کریں"</string>
-    <string name="account_setup_basics_password_label" msgid="784962388753706730">"پاس ورڈ"</string>
-    <string name="password_hint" msgid="4226682910292828279">"پاس ورڈ"</string>
-    <string name="signed_in_with_service_label" msgid="4282359206358453634">"‏‎%s کے ساتھ سائن ان ہیں"</string>
-    <string name="authentication_label" msgid="914463525214987772">"توثیق"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"توثیق شامل کریں"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"تصدیق صاف کریں"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"دستی سیٹ اپ"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"ایک درست ای میل پتہ اور پاس ورڈ ٹائپ کریں۔"</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"ڈپلیکیٹ اکاؤنٹ"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"آپ اکاؤنٹ \"<xliff:g id="DUPLICATE">%s</xliff:g>\" کیلئے پہلے سے ہی اس صارف نام کا استعمال کر رہے ہیں۔"</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"یہ پاس ورڈ ایک یا زائد خالی جگہ والے حروف کے ساتھ شروع یا ختم ہوتا ہے۔ بہت سارے سرورز خالی جگہوں والے پاس ورڈ کا تعاون نہیں کرتے ہیں۔"</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"اکاؤنٹ کی معلومات بازیافت کر رہا ہے…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"سرور کی ترتیبات کی توثیق کر رہا ہے…"</string>
-    <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_names_title" msgid="8780121351085082269">"اکاؤنٹ سیٹ اپ"</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>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"یہ فیلڈ خالی نہیں رہ سکتی۔"</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"اکاؤنٹ سیٹ اپ"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"اکاؤنٹ کی قسم"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"یہ کس قسم کا اکاؤنٹ ہے؟"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"اکاؤنٹ سیٹ اپ"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"اِن کمنگ سرور کی ترتیبات"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"صارف کا نام"</string>
-    <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"پاس ورڈ"</string>
-    <string name="account_setup_password_subheading" msgid="5930042642982830233">"پاس ورڈ"</string>
-    <string name="account_setup_incoming_server_label" msgid="5409694850973258387">"سرور"</string>
-    <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_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>
-    <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_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>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"اکاؤنٹ سیٹ اپ"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"آؤٹ گوئنگ سرور کی ترتیبات"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"‏SMTP سرور"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"پورٹ"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"سیکیورٹی کی قسم"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"سائن ان طلب کریں"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"صارف کا نام"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"پاس ورڈ"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"کلائنٹ سرٹیفکیٹ"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"منتخب کریں"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"کلائنٹ سرٹیفکیٹ استعمال کریں"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"ہٹائیں"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"کوئی نہیں"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"‏موبائل آلہ ID"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"اکاؤنٹ کی ترتیبات"</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_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>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"ہر 15 منٹ پر"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"ہر 30 منٹ پر"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"ہر گھنٹہ"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"ای میل پہنچنے پر مجھے اطلاع دیں"</string>
-    <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">"‏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>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"آخری دن"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"گزشتہ تین دن"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"گزشتہ ہفتہ"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"گزشتہ دو ہفتے"</string>
-    <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_fmt" msgid="8811464534757505457">"لاگ ان ناکام ہوگیا۔\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"محفوظ طریقے سے سرور سے مربوط نہیں ہوسکتا۔\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <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_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>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"سرور سے کنکشن نہیں کھول سکا۔"</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"آپ نے ایک غلط سرور کا پتہ ٹائپ کردیا یا سرور کو ایک ایسا پروٹوکول ورژن مطلوب ہے ای میل جس کا تعاون نہیں کرتا ہے۔"</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"آپ کو اس سرور کے ساتھ مطابقت پذیر بنانے کی اجازت نہیں ہے۔ مزید معلومات کیلئے اپنے سرور کے منتظم سے رابطہ کریں۔"</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"ریموٹ سیکیورٹی ایڈمنسٹریشن"</string>
-    <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"آپ ایک اکاؤنٹ کا صارف نام تبدیل نہیں کر سکتے ہیں۔ ایک مختلف صارف نام کے ساتھ ایک اکاؤنٹ شامل کرنے کیلئے اکاؤنٹ شامل کریں کو چھوئیں۔"</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"وارننگ: آپ کے آلے کا نظم و نسق کرنے کیلئے ای میل ایپس کا اختیار غیرفعال کرنے سے اس کا تقاضہ کرنے والے سبھی ای میل اکاؤنٹس، نیز ان کے ای میل، رابطے، کیلنڈر ایونٹس اور دیگر ڈیٹا حذف ہوجائیں گے۔"</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_change_title" msgid="615639963487448183">"سیکیورٹی کی پالیسیاں تبدیل ہوگئی ہیں"</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"سیکورٹی کی پالیسیاں پوری نہیں ہوسکتیں"</string>
-    <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>\" کیلئے ضروری ہے کہ آپ اپنے لاک اسکرین کا PIN یا پاس ورڈ تبدیل کریں۔"</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"لاک اسکرین کے پاس ورڈ کی میعاد ختم ہو رہی ہے"</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">"‏آپ کو جلد ہی اپنے لاک اسکرین کا 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> کیلئے ڈیٹا کو آپ کے آلے سے مٹایا جا رہا ہے۔ آپ اپنے لاک اسکرین کا PIN یا پاس ورڈ تبدیل کرکے اس کو بحال کر سکتے ہیں۔ کیا آپ اسے ابھی تبدیل کرنا چاہتے ہیں؟"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"غیر محفوظ شدہ تبدیلیاں مسترد کریں؟"</string>
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"سائن ان نہیں کر سکے"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> کیلئے صارف نام یا پاس ورڈ غلط ہے۔ کیا آپ اسے ابھی اپ ڈیٹ کرنا چاہتے ہیں؟"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"<xliff:g id="ACCOUNT">%s</xliff:g> میں آپ کا لاگ ان ناکام ہوگیا؛ سرور نے کہا: <xliff:g id="REASON">%s</xliff:g> کیا آپ اپنا صارف نام اور/یا پاس ورڈ اپ ڈیٹ کرنا چاہتے ہیں؟"</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>
-    <string name="account_settings_summary" msgid="4733776978291376161">"مطابقت پذیری، اطلاعات، وغیرہ کی فریکوئنسی"</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"ای میل پہنچنے پر اطلاع بھیجیں"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"مطابقت پذیری کی فریکوئنسی"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"اِن کمنگ ترتیبات"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"صارف نام، پاس ورڈ اور دیگر اِن کمنگ سرور کی ترتیبات"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"آؤٹ گوئنگ ترتیبات"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"صارف نام، پاس ورڈ اور دیگر آؤٹ گوئنگ سرور کی ترتیبات"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"پالیسیاں نافذ ہوگئیں"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"کوئی نہیں"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"غیر تعاون یافتہ پالیسیاں"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"کوئی نہیں"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"مطابقت پذیری کرنے کی کوشش کریں"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"یہ اکاؤنٹ مطابقت پذیر بنانے کیلئے یہاں چھوئیں"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"اکاؤنٹ کا نام"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"آپ کا نام"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"فوری جوابات"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"ای میل تحریر کرتے وقت اکثر داخل کیے جانے والے متن میں ترمیم کریں"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"اطلاع کی ترتیبات"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"ڈیٹا کا استعمال"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"سیکیورٹی کی پالیسیاں"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"سسٹم فولڈرز"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"کوڑے دان والا فولڈر"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"اپنے سرور کے کوڑے دان کا فولڈر منتخب کریں"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"اپنے سرور کے کوڑے دان کا فولڈر منتخب کریں"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"مرسلہ آئٹمز کا فولڈر"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"اپنے سرور کے مرسلہ آئٹمز کا فولڈر منتخب کریں"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"اپنے سرور کے مرسلہ آئٹمز کا فولڈر منتخب کریں"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"فوری جواب"</string>
-    <string name="save_action" msgid="5740359453077441466">"محفوظ کریں"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"رابطے مطابقت پذیر بنائیں"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"اس اکاؤنٹ کیلئے رابطے مطابقت پذیر بنائیں"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"کیلنڈر مطابقت پذیر بنائیں"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"اس اکاؤنٹ کیلئے کیلنڈر ایونٹ مطابقت پذیر بنائیں"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ای میل کو سنک کریں"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"اس اکاؤنٹ کیلئے ای میل مطابقت پذیر بنائیں"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"وائبریٹ کریں"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"رنگ ٹون منتخب کریں"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"سرور کی ترتیبات"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"مطابقت پذیری کے اختیارات"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"مطابقت پذیری کے اختیارات (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"یہ فولڈر مطابقت پذیر بنائیں"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"مربوط ہونے پر پیغامات ڈاؤن لوڈ ہوں گے"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"مطابقت پذیری کیلئے میل کے دن"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"مرسل کی تصویر"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"‏صرف کچھ \"پلس\" اکاؤنٹس میں POP رسائی شامل ہے جو اس پروگرام کو مربوط ہونے کی اجازت دیتے ہیں۔ اگر آپ اپنے درست ای میل پتہ اور پاس ورڈ کے ساتھ سائن ان کرنے سے قاصر ہیں تو ہوسکتا ہے کہ آپ کے پاس بامعاوضہ \"پلس\" اکاؤنٹ نہ ہو۔ ان ای میل اکاؤنٹس تک رسائی حاصل کرنے کے ویب براؤزر شروع کریں۔"</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"‏یہ ای میل اکاؤنٹ سیٹ اپ کرنے سے پہلے، T-Online ویب سائٹ ملاحظہ کریں اور POP3 ای میل تک رسائی کیلئے ایک پاس ورڈ بنائیں۔"</string>
-    <string name="exchange_name" msgid="3793803477985438102">"کارپوریٹ"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"اکاؤنٹ نہیں بنا سکا۔ دوبارہ کوشش کریں۔"</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"ای میل"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"سرور کیلئے مخصوص سیکیورٹی کی پالیسیاں فعال کرتا ہے"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"ترتیبات"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"عام ترتیبات"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"حذف کرنے سے پہلے توثیق کریں"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"بھیجنے سے پہلے تصدیق کریں"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"+999"</string>
-    <string name="search_hint" msgid="3491349343647799436">"ای میل تلاش کریں"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"آلہ کے کیمرے کے استعمال کی اجازت نہ دیں"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"آلہ کے پاس ورڈ کا تقاضہ کریں"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"حالیہ پاس ورڈز کے دوبارہ استعمال کو محدود کریں"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"پاس ورڈز کی میعاد ختم ہونے کا مطالبہ کریں"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"معطل آلہ کیلئے اپنی سکرین مقفل کرنے کا مطالبہ کریں"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"سنک کیے گئے کیلنڈر ایونٹس کی تعداد محدود کریں"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"مطابقت پذیر ای میلز کی تعداد محدود کریں"</string>
-    <string name="quick_1" msgid="9130521670178673190">"شکریہ!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"مجھے اچھا لگتا ہے!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"میں بعد میں اسے پڑھوں گا اور آپ کو جواب دوں گا۔"</string>
-    <string name="quick_4" msgid="216066940197616025">"اس پر گفتگو کرنے کیلئے آئیے ہم ایک میٹنگ طے کریں۔"</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"رومنگ کے وقت اس اکاؤنٹ کیلئے پس منظر کی مطابقت پذیری غیر فعال ہے۔"</string>
-    <string name="confirm_response" msgid="6764021931370809514">"جواب بھیج رہا ہے…"</string>
-    <string name="no_conversations" msgid="3785854971159919343">"کوئی پیغامات نہیں ہیں۔"</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"فولڈر کا انتخاب کار"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g> کیلئے سرور کے کوڑے دان کا فولڈر منتخب کریں"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> کیلئے سرور کے مرسلہ آئٹمز کا فولڈر منتخب کریں"</string>
-    <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>
-</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
deleted file mode 100644
index b60bc80..0000000
--- a/res/values-uz-rUZ/strings.xml
+++ /dev/null
@@ -1,298 +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-pochta biriktirmalarini o‘qish"</string>
-    <string name="permission_read_attachment_desc" msgid="6579059616090100181">"Ilovaga e-pochtangiz biriktirmalarini o‘qish uchun ruxsat beradi."</string>
-    <string name="permission_access_provider_label" msgid="977700184037298723">"E-pochta xizmati ma’lumotlariga kirish"</string>
-    <string name="permission_access_provider_desc" msgid="5338433949655493713">"Ilovaga e-pochtangiz ma’lumotlar bazasi, jumladan, olingan xabarlar, yuborilgan xabarlar, foydalanuvchi nomlari va parollarga kirish uchun ruxsat beradi."</string>
-    <string name="app_name" msgid="2206468539066258195">"Email"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Tuzatish"</string>
-    <string name="create_action" msgid="6575946089819721958">"Yangi yaratish"</string>
-    <string name="quick_responses_empty_view" msgid="3394094315357455290">"Tezkor javob andozalari yo‘q."</string>
-    <string name="account_settings_action" msgid="589969653965674604">"Hisob sozlamalari"</string>
-    <string name="status_network_error" msgid="526826323872477973">"Ulanishda muammo yuz berdi."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="3431489066510898753">"Xabarni ko‘chirish"</item>
-    <item quantity="other" msgid="5083310421670206821">"Xabarlarni ko‘chirish"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 hisoblarida ko‘chirib o‘tkazish qo‘llab-quvvatlanmaydi."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Xabarlarni ko‘chirib bo‘lmaydi, chunki ular turli hisoblarda joylashgan."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Qoralamalar, Chiquvchi va Yuborilgan xatlar jildidagi xabarlarni ko‘chirib bo‘lmaydi."</string>
-    <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Kelgan"</string>
-    <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Chiquvchi"</string>
-    <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Qoralamalar"</string>
-    <string name="mailbox_name_display_trash" msgid="7020792045007681852">"Chiqitdon"</string>
-    <string name="mailbox_name_display_sent" msgid="6705058612006729985">"Yuborilgan"</string>
-    <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Spam"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Yulduzchali"</string>
-    <string name="mailbox_name_display_unread" msgid="1453575937919310339">"O‘qilmagan"</string>
-    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Kelgan xatlar"</string>
-    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Yulduzchali"</string>
-    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Qoralamalar"</string>
-    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Chiquvchi xatlar"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Birgalikda ko‘rish"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Asl xabar --------\nMavzu: <xliff:g id="SUBJECT">%1$s</xliff:g>\nKimdan: <xliff:g id="SENDER">%2$s</xliff:g>\nKimga: <xliff:g id="TO">%3$s</xliff:g>\nNusxasi, kimga: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5836926808818821309">"Tezkor javobni qo‘yish"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Tezkor javobni qo‘yish"</string>
-    <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Qayta yo‘naltirilayotgan xabardagi bir yoki undan ortiq biriktirma yuborishdan oldin yuklab olinadi."</string>
-    <string name="attachment_not_found" msgid="5219773045406833000">"Biriktirmani yuklab olib bo‘lmadi."</string>
-    <string name="message_decode_error" msgid="91396461771444300">"Xabarni kodsizlashda xatolik yuz berdi."</string>
-    <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Bir yoki undan ortiq biriktirmalarni qayta yo‘naltirib bo‘lmadi."</string>
-    <string name="forward_download_failed_title" msgid="2043036709913723298">"Biriktirma qayta yo‘nal-madi"</string>
-    <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> hisobiga kirib bo‘lmadi."</string>
-    <string name="login_failed_title" msgid="1737884069957090004">"Tizimga kirib bo‘lmadi."</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
-  </plurals>
-    <string name="account_setup_basics_title" msgid="5050895656741229172">"Hisobni sozlash"</string>
-    <string name="oauth_authentication_title" msgid="3771260531636603518">"Ruxsat berishni so‘rash"</string>
-    <string name="sign_in_title" msgid="5051852806423550830">"Kirish"</string>
-    <string name="oauth_error_description" msgid="8466102021844409849">"Haqiqiylikni tekshirib bo‘lmadi"</string>
-    <string name="password_warning_label" msgid="1887439537224212124">"E-pochta manzili yoki parol noto‘g‘ri."</string>
-    <string name="email_confirmation_label" msgid="64258748053106017">"E-pochta manzili:"</string>
-    <string name="account_setup_basics_headline" msgid="8468280216822264643">"E-pochta hisobi"</string>
-    <string name="accounts_welcome" msgid="7230367425520242593">"E-pochtangiz manzili va parolini kiriting."</string>
-    <string name="account_setup_basics_email_label" msgid="8701406783555749929">"E-pochta manzili"</string>
-    <string name="or_label" msgid="6408695162723653446">"YOKI"</string>
-    <string name="sign_in_with_google" msgid="1412668282326928102">"Google orqali kirish"</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 hisobiga kirildi"</string>
-    <string name="authentication_label" msgid="914463525214987772">"HAQIQIYLIKNI TEK-SH"</string>
-    <string name="add_authentication_label" msgid="382998197798081729">"Haqiqiylikni tekshirishni qo‘shish"</string>
-    <string name="clear_authentication_label" msgid="4750930803913225689">"Haqiqiylikni tekshirishni o‘chirish"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="7690861839383362085">"Qo‘lda sozlash"</string>
-    <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Haqiqiy e-pochta manzili va parolni kiriting."</string>
-    <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Hisobdan nusxa olish"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Ushbu foydalanuvchi nomi “<xliff:g id="DUPLICATE">%s</xliff:g>” hisobida allaqachon foydalanilgan."</string>
-    <string name="account_password_spaces_error" msgid="1035535222734047745">"Ushbu parol bir yoki undan ortiq bo‘shliq bilan boshlanadi yoki tugaydi. Ko‘pgina serverlar bo‘shlig‘i bor parollarni qabul qilmaydi."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Hisob haqidagi ma’lumotlar olinmoqda…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Server sozlamalari tekshirilmoqda…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"SMTP sozlamalari tekshirilmoqda…"</string>
-    <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Hisob yaratilmoqda…"</string>
-    <string name="account_setup_ab_headline" msgid="1434091698882290052">"Hisob turini tasdiqlang"</string>
-    <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"<xliff:g id="EMAIL">%1$s</xliff:g> hisobida <xliff:g id="USERPROTOCOL">%2$s</xliff:g> emas, balki <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> protokolidan foydalanilayotgan bo‘lishi mumkin"</string>
-    <string name="account_setup_names_title" msgid="8780121351085082269">"Hisobni sozlash"</string>
-    <string name="account_setup_names_headline" msgid="2031978210683887370">"Hisobingiz sozlandi va e-pochtangiz tayyor bo‘ldi!"</string>
-    <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Ushbu hisobiga nom bering (ixtiyoriy)"</string>
-    <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Ismingiz (chiquvchi xabarlarda ko‘rsatiladi)"</string>
-    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Ushbu maydoncha bo‘sh qoldirilishi mumkin emas."</string>
-    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Hisobni sozlash"</string>
-    <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Hisob turi"</string>
-    <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Hisob turini tanlang"</string>
-    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Hisobni sozlash"</string>
-    <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Kiruvchi xatlar serveri sozlamalari"</string>
-    <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"FOYDALANUVCHI NOMI"</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">"XAVFSIZLIK TURI"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="2461510827337484818">"Hech biri"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="2834386066577239560">"SSL/TLS (Barcha sertifikatlarni qabul qilish)"</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 (barcha sertifikatlarni qabul qilish)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="3892291833944170882">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="2341742235654301690">"E-pochta xabarini serverdan o‘chirish"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="5777530843489961009">"Hech qachon"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Kelgan xatlar jildidan o‘chirganimda"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"IMAP yo‘li prefiksi"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Ixtiyoriy"</string>
-    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Hisobni sozlash"</string>
-    <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Chiquvchi xatlar serveri sozlamalari"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP SERVERI"</string>
-    <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"PORT"</string>
-    <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"XAVFSIZLIK TURI"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Tizimga kirishni talab qilish"</string>
-    <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"FOYDALANUVCHI NOMI"</string>
-    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"PAROL"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"MIJOZ SERTIFIKATI"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Tanlash"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Mijoz sertifikatidan foydalanish"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Olib tashlash"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Hech biri"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"MOBIL QURILMA ID RAQAMI"</string>
-    <string name="account_setup_options_title" msgid="3274463434235489134">"Hisob sozlamalari"</string>
-    <string name="account_setup_options_headline" msgid="4810292194395251968">"Hisob tanlamalari"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Sinxronlash oralig‘i:"</string>
-    <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Hech qachon"</string>
-    <string name="account_setup_options_mail_check_frequency_push" msgid="5511415696925307797">"Avtomatik (majburiy)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="8929785860545198867">"Har 5 daqiqada"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="8787901333816702849">"Har 10 daqiqada"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="7127640170766018765">"Har 15 daqiqada"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="4223562871143897449">"Har 30 daqiqada"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="107706566853925273">"Har soatda"</string>
-    <string name="account_setup_options_notify_label" msgid="3101529443722198112">"Yangi e-pochta xabarlari to‘g‘risida xabardor qilish"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="5029046373980454714">"Ushbu hisobdagi kontaktlarni sinxronlash"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="303441956432308807">"Ushbu hisobdagi taqvimni sinxronlash"</string>
-    <string name="account_setup_options_sync_email_label" msgid="468957966555663131">"Ushbu hisobdagi e-pochtani sinxronlash"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="4085327585082867216">"Wi-Fi ulanganda biriktirmalarni avtomatik ravishda yuklab olish"</string>
-    <string name="account_setup_failed_dlg_title" msgid="7923577224474005464">"Tugatib bo‘lmadi"</string>
-    <string name="account_setup_options_mail_window_label" msgid="4737241149297585368">"E-pochtani sinxronlash:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="7407981634952005775">"Avtomatik"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7930883294844418428">"So‘nggi kun"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="3435093562391555730">"So‘nggi uch kun"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5230695719358085318">"O‘tgan hafta"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="1144271277694832921">"So‘nggi ikki hafta"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="3228265299330513816">"O‘tgan oy"</string>
-    <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Barchasi"</string>
-    <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Hisob birlamchi soz-laridan foydalanish"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Foydalanuvchi nomi yoki parol noto‘g‘ri."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Kirib bo‘lmadi.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Hisobni sozlashda muammo yuz berdi"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Foydalanuvchi nomi, parol va hisob sozlamalari to‘g‘ri ekanligini tasdiqlang."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Serverga xavfsiz ulanib bo‘lmayapti."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="3451681985727559303">"Serverga xavfsiz ulanib bo‘lmayapti.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="4607859382193244795">"Mijoz sertifikati talab qilinadi. Mijoz sertifikati bilan serverga ulanishni xohlaysizmi?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="4574461885959029072">"Sertifikat haqiqiy emas yoki undan foydalanib bo‘lmaydi."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="430054384233036305">"Server xatolik bilan javob qaytardi. Foydalanuvchi nomi va parolingizni tekshirib, keyin qayta urinib ko‘ring."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="1180197172141077524">"Serverga ulanib bo‘lmayapti."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="3889441611138037320">"Serverga ulanib bo‘lmayapti.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_tls_required" msgid="1902309158359287958">"TLS server tomonidan qo‘llab-quvvatlanmayapti."</string>
-    <string name="account_setup_failed_auth_required" msgid="2684010997018901707">"Haqiqiylikni tekshirish usullari server tomonidan qo‘llab-quvvatlanmaydi."</string>
-    <string name="account_setup_failed_security" msgid="1627240499907011040">"Xavfsizlik bilan bog‘liq xato sababli serverga ulanishni ochib bo‘lmadi."</string>
-    <string name="account_setup_failed_ioerror" msgid="3862689923436539909">"Serverga ulanib bo‘lmadi."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4973054582044010375">"Server manzilini noto‘g‘ri kiritdingiz yoki server E-pochta qo‘llab-quvvatlamaydigan protokol versiyasini talab qilmoqda."</string>
-    <string name="account_setup_failed_access_denied" msgid="2051742796367919026">"Ushbu server bilan sinxronlash uchun vakolatingiz yo‘q. Qo‘shimcha ma’lumot olish uchun server administratoriga murojaat qiling."</string>
-    <string name="account_setup_security_required_title" msgid="667943309546419435">"Xavfsizlikni masofadan turib boshqarish"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"<xliff:g id="SERVER">%s</xliff:g> serveri Android qurilmangizning ba’zi xavfsizlik funksiyalarini masofadan turib boshqarishga ruxsat berishingizni talab qiladi. Ushbu hisobni sozlashni tugatilsinmi?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Sizning Android qurilmangiz server uchun majburiy bo‘lgan himoyalash funksiyalarini qo‘llab-quvvatlamaydi: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Hisobdagi foydalanuvchi nomini o‘zgartira olmaysiz. Boshqa foydalanuvchi nomi bilan yangi hisob qo‘shish uchun Hisob qo‘shish tugmasini bosing."</string>
-    <string name="disable_admin_warning" msgid="6001542250505146252">"OGOHLANTIRISH: Email ilovasi uchun qurilmangizni boshqarish vakolatini to‘xtatish ushbu vakolatdan foydalanuvchi barcha elektron pochta hisoblari, ulardagi xatlar, kontaktlar, taqvim va boshqa ma’lumotlarni ham o‘chirib tashlaydi."</string>
-    <string name="account_security_dialog_title" msgid="7003032393805438164">"Xavfsizlik yangilanishi"</string>
-    <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> xavfsizlik sozlamalarini yangilashingizni talab qiladi."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="3249185558872836884">"Xavfsizlik talablari tufayli “<xliff:g id="ACCOUNT">%s</xliff:g>” hisobini sinxronlab bo‘lmaydi."</string>
-    <string name="security_needed_ticker_fmt" msgid="7099561996532829229">"“<xliff:g id="ACCOUNT">%s</xliff:g>” hisobi uchun xavfsizlik sozlamalarini yangilash zarur."</string>
-    <string name="security_changed_ticker_fmt" msgid="3823930420292838192">"“<xliff:g id="ACCOUNT">%s</xliff:g>” hisobida xavfsizlik sozlamalarini yangilandi. Hech narsa qilish shart emas."</string>
-    <string name="security_notification_content_update_title" msgid="6321099538307807621">"Xavfsizlik yangilanishi zarur"</string>
-    <string name="security_notification_content_change_title" msgid="615639963487448183">"Xavfsizlik siyosati o‘zgardi."</string>
-    <string name="security_notification_content_unsupported_title" msgid="6494791400431198228">"Xavfsizlik qoida. mos kelmaydi"</string>
-    <string name="account_security_title" msgid="6072273231606918870">"Qurilma xavfsizligi"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="2527501853520160827">"<xliff:g id="SERVER">%s</xliff:g> serveri Android qurilmangizning ayrim xavfsizlik funksiyalarini masofadan turib boshqarishga ruxsat berishingizni talab qiladi."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="8155332642922842729">"Ma’lumotlarni tahrir qilish"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="5543005790538884060">"“<xliff:g id="ACCOUNT">%s</xliff:g>” hisobi uchun qulflash ekrani PIN-kodi yoki parolini o‘zgartirish zarur."</string>
-    <string name="password_expire_warning_content_title" msgid="4360288708739366810">"Qulf. ekrani paroli eskirmoqda"</string>
-    <string name="password_expired_ticker" msgid="3098703963402347483">"Qulflash ekrani PIN-kodi yoki paroli eskirgan."</string>
-    <string name="password_expired_content_title" msgid="7379094218699681984">"Qulf. ekrani paroli eskirgan"</string>
-    <string name="password_expire_warning_dialog_title" msgid="4901499545146045672">"Qulflash ekrani paroli muddati tugamoqda"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="1093389293050776319">"Siz tez orada qulflash ekrani PIN-kodi yoki parolini o‘zgartirishingiz lozim, aks holda <xliff:g id="ACCOUNT">%s</xliff:g> hisobi ma’lumotlari o‘chib ketadi. Uni hozir o‘zgartirmoqchimisiz?"</string>
-    <string name="password_expired_dialog_title" msgid="7275534155170185252">"Qulflash ekrani paroli eskirgan"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"<xliff:g id="ACCOUNT">%s</xliff:g> hisobi ma’lumotlari qurilmangizdan o‘chirilmoqda. Uni qulflash ekrani PIN-kodi yoki parolini o‘zgartirish orqali tiklashingiz mumkin. Uni hozir o‘zgartirmoqchimisiz?"</string>
-    <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Saqlanmagan o‘zgartirishlar bekor qilinsinmi?"</string>
-    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Tizimga kirib bo‘lmadi"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> hisobi uchun foydalanuvchi nomi yoki parol noto‘g‘ri. Ularni hozir yangilamoqchimisiz?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"<xliff:g id="ACCOUNT">%s</xliff:g> hisobiga kirib bo‘lmadi. Muammoning sababi: <xliff:g id="REASON">%s</xliff:g>. Foydalanuvchi nomi va/yoki parolingizni yangilamoqchimisiz?"</string>
-    <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Biriktirmalarni yuklab olish"</string>
-    <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Biriktirmalarni Wi-Fi mavjudligida avtomatik yuklab olish"</string>
-    <string name="account_settings_notify_label" msgid="8621226576645167987">"E-pochta bildirishnomalari"</string>
-    <string name="account_settings_summary" msgid="4733776978291376161">"Sinxronlash oralig‘i, bildirishnomalar va h.k."</string>
-    <string name="account_settings_notify_summary" msgid="88560545461159120">"E-pochta kelganda bildirishnoma yuborish"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4107847714594035131">"Sinxronlash oralig‘i"</string>
-    <string name="account_settings_incoming_label" msgid="3793314460723296874">"Kiruvchi xat sozlamalari"</string>
-    <string name="account_settings_incoming_summary" msgid="7521181981008371492">"Foyd. nomi, parol va kiruvchi xatlar serverining boshqa soz-lari"</string>
-    <string name="account_settings_outgoing_label" msgid="4997504719643828381">"Chiquvchi xat sozlamalari"</string>
-    <string name="account_settings_outgoing_summary" msgid="1884202151340479161">"Foyd. nomi, parol va chiq. xatlar serverining boshqa soz-lari"</string>
-    <string name="account_settings_enforced_label" msgid="7005050362066086119">"Majburiy tartiblar"</string>
-    <string name="account_settings_enforced_summary" msgid="1668581504445370253">"Hech biri"</string>
-    <string name="account_settings_unsupported_label" msgid="7286722617178322465">"Qo‘llab-quvvatlanmaydigan qoidalar"</string>
-    <string name="account_settings_unsupported_summary" msgid="1980825746966562221">"Hech biri"</string>
-    <string name="account_settings_retry_label" msgid="8605492340808650923">"Sinxronlashga urinish"</string>
-    <string name="account_settings_retry_summary" msgid="2598065993718592906">"Ushbu hisobni sinxronlash uchun bu yerga bosing"</string>
-    <string name="account_settings_description_label" msgid="2073736045984411004">"Hisob nomi"</string>
-    <string name="account_settings_name_label" msgid="8230436030850457988">"Ismingiz"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"Tezkor javoblar"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"E-pochta uchun o‘zingiz tez-tez kiritadigan matnni tahrir qilish"</string>
-    <string name="account_settings_notifications" msgid="2842952349214972116">"Bildirishnoma sozlamalari"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"Trafik sarfi"</string>
-    <string name="account_settings_policies" msgid="5972183883466873359">"Xavfsizlik siyosati"</string>
-    <string name="system_folders_title" msgid="7161311881709109736">"Tizim jildlari"</string>
-    <string name="system_folders_trash_title" msgid="3190927115504713123">"Chiqitdon"</string>
-    <string name="system_folders_trash_summary" msgid="2583143581531897068">"Serverdan “Chiqitdon” jildini tanlang"</string>
-    <string name="system_folders_trash_dlg" msgid="353701568340939392">"Serverdan “Chiqitdon” jildini tanlang"</string>
-    <string name="system_folders_sent_title" msgid="8792934374188279309">"Yuborilgan xatlar jildi"</string>
-    <string name="system_folders_sent_summary" msgid="4252740721870748375">"Serverdan yuborilgan xatlar jildini tanlang"</string>
-    <string name="system_folders_sent_dlg" msgid="818944260541160146">"Serverdan yuborilgan xatlar jildini tanlang"</string>
-    <string name="edit_quick_response_dialog" msgid="3048014284772648575">"Tezkor javob"</string>
-    <string name="save_action" msgid="5740359453077441466">"Saqlash"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="2642448079273767521">"Kont-larni sinx-lash"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="1716022682035150630">"Ushbu hisob kont-larini sinxronlash"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3172491863244160828">"Taqvimni sinxronlash"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Ushbu hisobning taqvim tadbirlarini sinxronlash"</string>
-    <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"E-pochtani sinx-lash"</string>
-    <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Ushbu hisob e-pochtasini sinx-lash"</string>
-    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Tebranish"</string>
-    <string name="account_settings_ringtone" msgid="2238523918221865167">"Rington tanlash"</string>
-    <string name="account_settings_servers" msgid="3386185135392642067">"Server sozlamalari"</string>
-    <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sinxronlash tanlamalari"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"Sinxronlash tanlamalari (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Ushbu jildni sinxronlash"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Internetga ulanganda xabarlarni yuklab olish"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Pochtani sinxronlash kunlari"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Yuboruvchining rasmi"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"Faqat ba’zi “Plus” hisoblari ushbu dasturga ulanish uchun ruxsat beradigan POP protokolidan foydalanish vakolatini o‘z ichiga oladi. Agar o‘z e-pochta manzilingiz va parolingiz bilan tizimga kira olmayotgan bo‘lsangiz, demak, sizda bepul hisob mavjud (Plus emas). Ushbu e-pochta hisoblariga kirish uchun veb-brauzerni ishga tushiring."</string>
-    <string name="provider_note_t_online" msgid="1596701148051980218">"Ushbu e-pochta hisobini sozlashdan oldin T-Online veb-saytiga tashrif buyuring va POP3 protokoli bo‘yicha e-pochtaga kirish uchun parol o‘rnating."</string>
-    <string name="exchange_name" msgid="3793803477985438102">"Korporativ"</string>
-    <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="2248313263003927725">"Hisobni yaratib bo‘lmadi. Qaytadan urinib ko‘ring."</string>
-    <string name="device_admin_label" msgid="3335272972461391415">"Email"</string>
-    <string name="device_admin_description" msgid="4299378570982520839">"Serverga oid xavfsizlik qoidalarini kuchga kiritadi"</string>
-    <string name="settings_activity_title" msgid="4787565736829092053">"Sozlamalar"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"Umumiy sozlamalar"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"O‘chirishdan oldin tasdiqlash"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Yuborishdan oldin tasdiqlash"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"E-pochtadan qidirish"</string>
-    <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Qurilma kamerasidan foydalanishni taqiqlash"</string>
-    <string name="policy_require_password" msgid="3556860917024612396">"Qurilmani ochish uchun parol so‘rash"</string>
-    <string name="policy_password_history" msgid="9001177390979112746">"So‘nggi parollardan qayta foydalanishni cheklash"</string>
-    <string name="policy_password_expiration" msgid="1287225242918742275">"Parollarning amal qilish muddatini cheklash"</string>
-    <string name="policy_screen_timeout" msgid="3499201409239287702">"Kutish rejimida qurilma ekranini har doim quflash"</string>
-    <string name="policy_calendar_age" msgid="6469328498345236120">"Sinxronlanadigan taqvim tadbirlari sonini cheklash"</string>
-    <string name="policy_email_age" msgid="3521941976575225050">"Sinx-lanadigan e-pochta xabarlari sonini cheklash"</string>
-    <string name="quick_1" msgid="9130521670178673190">"Katta rahmat!"</string>
-    <string name="quick_2" msgid="8611591278119481491">"Ajoyib fikr!"</string>
-    <string name="quick_3" msgid="8070999183033184986">"Buni keyinroq o‘qib, javob beraman."</string>
-    <string name="quick_4" msgid="216066940197616025">"Buni ko‘rishib, keyin muhokama qilish lozim."</string>
-    <string name="require_manual_sync_message" msgid="7361932179783481686">"Ushbu hisob uchun rouming vaqtida orqa fonda sinxronlash o‘chirib qo‘yildi."</string>
-    <string name="confirm_response" msgid="6764021931370809514">"Javob yuborilmoqda…"</string>
-    <string name="no_conversations" msgid="3785854971159919343">"Xabarlar yo‘q."</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"Jild tanlash"</string>
-    <string name="trash_folder_selection_title" msgid="686039558899469073">"<xliff:g id="ACCOUNT">%s</xliff:g>: serverdan jildni tanlang"</string>
-    <string name="sent_folder_selection_title" msgid="9207482909822072856">"<xliff:g id="ACCOUNT">%s</xliff:g> uchun serverdan jild tanlash"</string>
-    <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Jildlar ro‘yxati yuklanmoqda…"</string>
-    <string name="no_quick_responses" msgid="8716297053803961304">"Hech narsa topilmadi"</string>
-    <!-- no translation found for gmail_name (2099786953868369991) -->
-    <skip />
-    <!-- no translation found for folder_sync_settings_pref_title (349478353401667107) -->
-    <skip />
-</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 76c2292..79593e2 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Truy cập dữ liệu của nhà cung cấp email"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Cho phép ứng dụng truy cập cơ sở dữ liệu email của bạn, bao gồm thư đã nhận, thư đã gửi, tên người dùng và mật khẩu."</string>
     <string name="app_name" msgid="2206468539066258195">"Email"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Gỡ lỗi"</string>
     <string name="create_action" msgid="6575946089819721958">"Tạo mới"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Không có câu trả lời nhanh nào."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Cài đặt tài khoản"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Sự cố kết nối."</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Di chuyển thư"</item>
+    <item quantity="other" msgid="5083310421670206821">"Di chuyển thư"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Di chuyển không được hỗ trợ trên các tài khoản POP3."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Không thể di chuyển vì lựa chọn chứa nhiều tài khoản."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Không thể di chuyển thư trong Thư nháp, Hộp thư đi và Thư đã gửi."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Hộp thư đến"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Hộp thư đi"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Tin nháp"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Thư rác"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Thư gắn dấu sao"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Chưa đọc"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Gỡ lỗi"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Hộp thư đến"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Được gắn dấu sao"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Tin nháp"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Hộp thư đi"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Chế độ xem tổng hợp"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Tin nhắn gốc --------\nChủ đề: <xliff:g id="SUBJECT">%1$s</xliff:g>\nTừ: <xliff:g id="SENDER">%2$s</xliff:g>\nTới: <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">"Chèn trả lời nhanh"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Chèn trả lời nhanh"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Một hoặc nhiều tệp đính kèm trong thư chuyển tiếp của bạn sẽ được tải xuống trước khi gửi."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Không thể tải xuống tệp đính kèm."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Đã xảy ra lỗi khi giải mã thư."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Không thể chuyển tiếp một hoặc nhiều tệp đính kèm"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Tệp đính kèm không được chuyển tiếp"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"Đăng nhập vào <xliff:g id="ACCOUNT_NAME">%s</xliff:g> không thành công."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Không thể đăng nhập"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Thiết lập tài khoản"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Yêu cầu ủy quyền"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Đăng nhập"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Hãy nhập địa chỉ email và mật khẩu hợp lệ."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"Tài khoản trùng lặp"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Bạn đã và đang sử dụng tên người dùng này cho tài khoản \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Mật khẩu này bắt đầu hoặc kết thúc bằng một hoặc nhiều ký tự dấu cách. Nhiều máy chủ không hỗ trợ mật khẩu chứa dấu cách."</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Đang truy xuất thông tin tài khoản…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Đang xác thực cài đặt máy chủ…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Đang xác thực cài đặt smtp…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Đang tạo tài khoản..."</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Xác nhận loại tài khoản"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Bạn cho biết <xliff:g id="EMAIL">%1$s</xliff:g> sử dụng <xliff:g id="USERPROTOCOL">%2$s</xliff:g> nhưng tài khoản có thể sử dụng <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Thiết lập tài khoản"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"Tài khoản của bạn đã được thiết lập và email đang được gửi!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Đặt tên cho tài khoản này (tùy chọn)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Tên bạn (được hiển thị trong tin nhắn đi)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Không được để trống trường này."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Thiết lập tài khoản"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Loại tài khoản"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Đây loại tài khoản gì?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Thiết lập tài khoản"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Cài đặt máy chủ thư đến"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"TÊN NGƯỜI DÙNG"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"MẬT KHẨU"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Khi tôi xóa khỏi Hộp thư đến"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Tiền tố đường dẫn IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Tùy chọn"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Thiết lập tài khoản"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Cài đặt máy chủ thư đi"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"MÁY CHỦ SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"CỔNG"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"LOẠI BẢO MẬT"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Yêu cầu đăng nhập"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"TÊN NGƯỜI DÙNG"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"MẬT KHẨU"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"CHỨNG CHỈ ỨNG DỤNG KHÁCH"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Chọn"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Sử dụng chứng chỉ ứng dụng khách"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Xóa"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Không"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"ID THIẾT BỊ DI ĐỘNG"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Cài đặt tài khoản"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Tùy chọn tài khoản"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Tần suất động bộ hóa:"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Chưa bao giờ"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Tất cả"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Sử dụng mặc định tài khoản"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Tên người dùng hoặc mật khẩu không chính xác."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Đăng nhập không thành công.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Sự cố với thiết lập tài khoản"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Xác nhận tên người dùng, mật khẩu và cài đặt tài khoản là đúng."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Không thể kết nối an toàn với máy chủ."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Quản lý bảo mật từ xa"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Máy chủ <xliff:g id="SERVER">%s</xliff:g> yêu cầu bạn cho phép kiểm soát từ xa một số tính năng bảo mật của thiết bị Android của bạn. Bạn có muốn hoàn tất việc thiết lập tài khoản này không?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Máy chủ này yêu cầu các tính năng bảo mật mà thiết bị Android của bạn không hỗ trợ, bao gồm: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Bạn không thể thay đổi tên người dùng của tài khoản. Để thêm tài khoản có tên người dùng khác, hãy chạm vào Thêm tài khoản."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"CẢNH BÁO: Việc vô hiệu hóa quyền quản lý điện thoại của bạn của ứng dụng Email sẽ xóa tất cả tài khoản email yêu cầu quyền đó, cùng với email, địa chỉ liên hệ, sự kiện lịch và các dữ liệu khác."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Cập nhật bảo mật"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> yêu cầu bạn cập nhật cài đặt bảo mật của mình."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Mật khẩu khóa màn hình đã hết hạn"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Dữ liệu của <xliff:g id="ACCOUNT">%s</xliff:g> đang bị xóa khỏi thiết bị của bạn. Bạn có thể khôi phục dữ liệu bằng cách thay đổi PIN khóa màn hình hoặc mật khẩu của mình. Bạn có muốn thay đổi ngay bây giờ không?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Hủy những thay đổi chưa lưu?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Không thể đăng nhập"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Tên người dùng hoặc mật khẩu của <xliff:g id="ACCOUNT">%s</xliff:g> không chính xác. Bạn có muốn cập nhật các thông tin này ngay bây giờ không?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Đăng nhập của bạn vào <xliff:g id="ACCOUNT">%s</xliff:g> không thành công; máy chủ cho biết: <xliff:g id="REASON">%s</xliff:g> Bạn có muốn cập nhật tên người dùng và/hoặc mật khẩu của mình không?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Tải xuống tệp đính kèm"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Tự động tải xuống tệp đính kèm tin nhắn gần đây qua Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Thông báo qua email"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Đồng bộ hóa sự kiện lịch cho tài khoản này"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Đồng bộ hóa email"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Đồng bộ hóa email cho tài khoản này"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Rung"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Rung"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Chọn nhạc chuông"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Cài đặt máy chủ"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Tùy chọn đồng bộ hóa"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Đồng bộ hóa thư mục này"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Thư sẽ tải xuống khi được kết nối"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Số ngày của thư sẽ đồng bộ hóa"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Ảnh người gửi"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Chỉ một số tài khoản \"Plus\" mới có quyền truy cập POP cho phép chương trình này kết nối. Nếu bạn không thể đăng nhập bằng địa chỉ email và mật khẩu chính xác của mình, bạn có thể không có tài khoản \"Plus\" tính phí. Hãy chạy trình duyệt web để yêu cầu cấp quyền truy cập vào các tài khoản email này."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Trước khi thiết lập tài khoản email này, hãy truy cập trang web T-Online và tạo mật khẩu để truy cập email POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Doanh nghiệp"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Không thể tạo tài khoản. Hãy thử lại."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"Email"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Cho phép chính sách bảo mật được máy chủ chỉ định"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Cài đặt"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Cài đặt chung"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Xác nhận trước khi xóa"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Xác nhận trước khi gửi"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Tìm kiếm email"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Ko cho phép sử dụng máy ảnh của thiết bị"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Yêu cầu mật khẩu của thiết bị"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Hạn chế sử dụng lại các mật khẩu gần đây"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Tôi thấy được đấy!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Tôi sẽ đọc thư này sau và sẽ liên hệ lại với bạn."</string>
     <string name="quick_4" msgid="216066940197616025">"Chúng ta hãy cùng tổ chức một cuộc họp để thảo luận về vấn đề này."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Đồng bộ hóa nền cho tài khoản này bị tắt trong khi chuyển vùng."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Đang gửi trả lời..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Cá nhân (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Cá nhân (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Không có thư nào."</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Công cụ chọn thư mục"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Chọn thư mục thùng rác trên máy chủ cho <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Chọn thư mục chứa mục đã gửi trên máy chủ cho <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Đang tải danh sách thư mục…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Không có câu trả lời nào"</string>
     <string name="gmail_name" msgid="2099786953868369991">"Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Cài đặt đồng bộ hóa thư mục"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 041998d..6caa897 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"访问电子邮件服务提供商数据"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"允许此应用访问您的电子邮件数据库,包括已收邮件、已发邮件、用户名和密码。"</string>
     <string name="app_name" msgid="2206468539066258195">"电子邮件"</string>
+    <string name="debug_title" msgid="1337476992195531309">"调试"</string>
     <string name="create_action" msgid="6575946089819721958">"新建"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"没有快速回复。"</string>
     <string name="account_settings_action" msgid="589969653965674604">"帐户设置"</string>
+    <string name="status_network_error" msgid="526826323872477973">"发生连接问题。"</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"移动邮件"</item>
+    <item quantity="other" msgid="5083310421670206821">"移动邮件"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3帐户不支持移动邮件的操作。"</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"所选内容包含多个帐户的邮件,因此无法进行移动。"</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"无法移动“草稿”、“发件箱”和“已发邮件”中的邮件。"</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"收件箱"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"发件箱"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"草稿"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"垃圾邮件"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"已加星标"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"未读邮件"</string>
-    <string name="debug_title" msgid="1337476992195531309">"调试"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"收件箱"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"已加星标的内容"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"草稿"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"发件箱"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"无法下载该附件。"</string>
     <string name="message_decode_error" msgid="91396461771444300">"解码邮件时出错。"</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"一个或多个附件无法转发。"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"无法转发附件"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> 登录失败。"</string>
     <string name="login_failed_title" msgid="1737884069957090004">"无法登录"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"帐户设置"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"正在请求授权"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"登录"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"请键入有效的电子邮件地址和密码。"</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"帐户重复"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"帐户“<xliff:g id="DUPLICATE">%s</xliff:g>”已经使用了此用户名。"</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"该密码的开头或结尾存在一个或多个空格。很多服务器不支持带空格的密码。"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"正在检索帐户信息..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"正在验证服务器设置…"</string>
     <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_names_title" msgid="8780121351085082269">"帐户设置"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"此字段不能为空。"</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"帐户设置"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"帐户类型"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"这是什么类型的帐户?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"帐户设置"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"接收服务器设置"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"用户名"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"密码"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"帐户设置"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"外发服务器设置"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP服务器"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"端口"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"安全类型"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"要求登录"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"用户名"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"密码"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"客户端证书"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"选择"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"使用客户端证书"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"移除"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"无"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"移动设备ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"帐户设置"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"登录失败。\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"远程安全管理"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"您无法更改帐户的用户名。要添加使用其他用户名的帐户,请触摸“添加帐户”。"</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"警告:撤消“电子邮件”应用管理您设备的权限会删除所有需要此权限的电子邮件帐户,以及这些帐户中的电子邮件、联系人、日历活动和其他数据。"</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>
@@ -168,8 +207,11 @@
     <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> 的数据已从设备中清除。您可以通过更改锁定屏幕 PIN 或密码来还原这些数据。要立即更改吗?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"要舍弃未保存的更改?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"无法登录"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> 的用户名或密码不正确。要立即更新吗?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"无法登录 <xliff:g id="ACCOUNT">%s</xliff:g>;服务器提示:<xliff:g id="REASON">%s</xliff:g>。您要更新自己的用户名和/或密码吗?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"下载附件"</string>
-    <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"通过WLAN自动下载近期邮件的附件"</string>
+    <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"通过WLAN自动下载最新邮件的附件"</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>
@@ -189,7 +231,7 @@
     <string name="account_settings_edit_quick_responses_label" msgid="6105791335935883199">"快速回复"</string>
     <string name="account_settings_edit_quick_responses_summary" msgid="5406599402930290682">"编辑您在写电子邮件时经常插入的文本"</string>
     <string name="account_settings_notifications" msgid="2842952349214972116">"通知设置"</string>
-    <string name="account_settings_data_usage" msgid="6400715160238559711">"流量使用"</string>
+    <string name="account_settings_data_usage" msgid="6400715160238559711">"数据使用"</string>
     <string name="account_settings_policies" msgid="5972183883466873359">"安全策略"</string>
     <string name="system_folders_title" msgid="7161311881709109736">"系统文件夹"</string>
     <string name="system_folders_trash_title" msgid="3190927115504713123">"已删除邮件文件夹"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"同步此帐户中的日历活动"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"同步电子邮件"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"同步此帐户中的电子邮件"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"振动"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"振动"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"选择铃声"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"服务器设置"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"同步选项"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"同步此文件夹"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"连接到网络后下载邮件"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"同步最近多少天的邮件"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"发件人头像"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"只有某些“Plus”帐户支持 POP 访问而允许此程序进行连接。如果您使用正确的电子邮件地址和密码无法登录,则可能还未开通付费的“Plus”帐户。请启动网络浏览器以获取对这些电子邮件帐户的访问权限。"</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"在设置该电子邮件帐户之前,请访问T-Online网站创建密码,以便使用POP3电子邮件功能。"</string>
+    <string name="exchange_name" msgid="3793803477985438102">"公司"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"无法创建帐户,请重试。"</string>
     <string name="device_admin_label" msgid="3335272972461391415">"电子邮件"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"启用服务器专有的安全策略"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"设置"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"常规设置"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"删除前先确认"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"发送前先确认"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"搜索电子邮件"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"不允许使用设备的相机"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"需要设备密码"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"限制重复使用近期所用密码"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"我觉得不错!"</string>
     <string name="quick_3" msgid="8070999183033184986">"稍后我会阅读此邮件并给您回复。"</string>
     <string name="quick_4" msgid="216066940197616025">"我们可以安排一个会议,讨论一下这个问题。"</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"漫游时停用了此帐户的后台同步功能。"</string>
     <string name="confirm_response" msgid="6764021931370809514">"正在发送回复…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"个人(IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"个人(POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"无邮件。"</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"选择文件夹"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"选择 <xliff:g id="ACCOUNT">%s</xliff:g> 在服务器上的已删除邮件文件夹"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"选择 <xliff:g id="ACCOUNT">%s</xliff:g> 在服务器上的已发邮件文件夹"</string>
     <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>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e662f8d..316ae8f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"取覽電郵供應商資料"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"允許應用程式存取您的電子郵件資料庫,包括收到的郵件、送出的郵件、用戶名稱和密碼。"</string>
     <string name="app_name" msgid="2206468539066258195">"電子郵件"</string>
+    <string name="debug_title" msgid="1337476992195531309">"除錯"</string>
     <string name="create_action" msgid="6575946089819721958">"建立新回應"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"沒有快速回應。"</string>
     <string name="account_settings_action" msgid="589969653965674604">"帳戶設定"</string>
+    <string name="status_network_error" msgid="526826323872477973">"連線問題。"</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"移動郵件"</item>
+    <item quantity="other" msgid="5083310421670206821">"移動郵件數"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 帳戶不支援郵件移動功能。"</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"無法移動,因為選取了多個帳戶。"</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"無法移動 [草稿]、[寄件箱] 及 [寄件備份] 中的郵件。"</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"收件箱"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"寄件箱"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"草稿"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"垃圾郵件"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"已加星號"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"未閱讀"</string>
-    <string name="debug_title" msgid="1337476992195531309">"除錯"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"收件箱"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"已加星號"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"草稿"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"寄件箱"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"無法下載附件。"</string>
     <string name="message_decode_error" msgid="91396461771444300">"為訊息解碼時發生錯誤。"</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"無法轉寄一個或多個附件。"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"無法轉寄附件"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> 登入失敗。"</string>
     <string name="login_failed_title" msgid="1737884069957090004">"無法登入"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"帳戶設定"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"正在要求授權"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"登入"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"請輸入有效的電郵地址和密碼。"</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"重複帳戶"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"您的「<xliff:g id="DUPLICATE">%s</xliff:g>」帳戶已經使用這個用戶名稱。"</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"這組密碼的開頭或結尾為一個或多個空白字元,許多伺服器都不支援包含空白字元的密碼。"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"正在擷取帳戶資訊..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"正在驗證伺服器設定…"</string>
     <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_names_title" msgid="8780121351085082269">"帳戶設定"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"這個欄位不能留空。"</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"帳戶設定"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"帳戶類型"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"這是什麼類型的帳戶?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"帳戶設定"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"內送伺服器設定"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"使用者名稱"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"密碼"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"帳戶設定"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"外寄伺服器設定"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP 伺服器"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"通訊埠"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"安全類型"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"要求登入"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"使用者名稱"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"密碼"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"用戶端憑證"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"選取"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"使用用戶端憑證"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"移除"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"無"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"流動裝置識別碼"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"帳戶設定"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"登入失敗。\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"遠端安全性管理"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"您無法更改帳戶的用戶名稱。如要以另一個用戶名稱新增帳戶,請輕觸「新增帳戶」。"</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"警告:如果停用「電子郵件」應用程式的裝置管理權限,系統將刪除所有需要使用這項權限的電郵帳戶,以及帳戶中的所有電子郵件、通訊錄、日曆活動和其他資料。"</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>
@@ -168,6 +207,9 @@
     <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> 的資料已從您的裝置中清除,如要還原這些資料,請更改屏幕上鎖 PIN 或密碼,要立即更改嗎?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"要丟棄尚未儲存的變更嗎?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"無法登入"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> 的用戶名稱或密碼不正確。您要現在更新嗎?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"您無法登入 <xliff:g id="ACCOUNT">%s</xliff:g> (伺服器顯示訊息:<xliff:g id="REASON">%s</xliff:g>)。您要更新用戶名稱和/或密碼嗎?"</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>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"保持這個帳戶的日曆活動同步"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"同步處理電子郵件"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"同步處理這個帳戶的電子郵件"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"震動"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"震動"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"選擇鈴聲"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"伺服器設定"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"同步處理選項"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"同步處理此資料夾"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"連線時會下載郵件"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"同步處理天數"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"寄件者圖片"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"只有部分附有 POP 存取功能的「Plus」帳戶能與這個程式連線。如果您輸入的電郵地址和密碼無誤,卻仍無法登入,表示您可能尚未購買「Plus」帳戶。請啟動網頁瀏覽器,以存取這些電郵帳戶。"</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"在設定此電郵帳戶之前,請先登上 T-Online 網站,設定 POP3 電郵收發功能的密碼。"</string>
+    <string name="exchange_name" msgid="3793803477985438102">"公司"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"無法建立帳戶,請再試一次。"</string>
     <string name="device_admin_label" msgid="3335272972461391415">"電郵"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"啟用伺服器專用安全性政策"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"設定"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"一般設定"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"刪除前須確認"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"傳送前須確認"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999 +"</string>
+    <string name="search_hint" msgid="3491349343647799436">"搜尋電郵"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"不允許使用裝置相機"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"需要裝置密碼"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"限制重用最近用過的密碼"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"這主意不錯!"</string>
     <string name="quick_3" msgid="8070999183033184986">"我稍後看過再回覆您。"</string>
     <string name="quick_4" msgid="216066940197616025">"開會討論吧。"</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"這個帳戶的背景同步功能於漫遊時停用。"</string>
     <string name="confirm_response" msgid="6764021931370809514">"正在傳送回應..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"個人 (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"個人 (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"沒有郵件。"</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"資料夾選取工具"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"選取 <xliff:g id="ACCOUNT">%s</xliff:g> 的伺服器垃圾桶資料夾"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"選取 <xliff:g id="ACCOUNT">%s</xliff:g> 的伺服器寄件備份資料夾"</string>
     <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>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 99b013e..6646146 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -21,9 +21,18 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"存取電子郵件供應商資料"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"允許這個應用程式存取您的電子郵件資料庫,包括收到的郵件、寄件備份、使用者名稱和密碼。"</string>
     <string name="app_name" msgid="2206468539066258195">"電子郵件"</string>
+    <string name="debug_title" msgid="1337476992195531309">"偵錯"</string>
     <string name="create_action" msgid="6575946089819721958">"建立新回應"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"沒有任何快速回應。"</string>
     <string name="account_settings_action" msgid="589969653965674604">"帳戶設定"</string>
+    <string name="status_network_error" msgid="526826323872477973">"連線問題。"</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"移動郵件"</item>
+    <item quantity="other" msgid="5083310421670206821">"移動郵件數"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"POP3 帳戶不支援郵件移動功能。"</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"無法移動,因為選取了多個帳戶。"</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"無法移動 [草稿]、[寄件匣] 及 [寄件備份] 中的郵件。"</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"收件匣"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"寄件匣"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"草稿"</string>
@@ -32,17 +41,37 @@
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"垃圾郵件"</string>
     <string name="mailbox_name_display_starred" msgid="8076384721309828453">"已加星號"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"未讀取"</string>
-    <string name="debug_title" msgid="1337476992195531309">"偵錯"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"收件匣"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"已加星號"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"草稿"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"寄件匣"</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_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>
+    <string name="attachment_not_found" msgid="5219773045406833000">"無法下載附件。"</string>
     <string name="message_decode_error" msgid="91396461771444300">"為郵件解碼時發生錯誤。"</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"無法轉寄一或多個附件。"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"無法轉寄附件"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> 登入失敗。"</string>
     <string name="login_failed_title" msgid="1737884069957090004">"無法登入"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"帳戶設定"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"正在要求授權"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"登入"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"輸入有效的電子郵件地址和密碼。"</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"複製帳戶"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"您的「<xliff:g id="DUPLICATE">%s</xliff:g>」帳戶已經使用這個使用者名稱。"</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"這組密碼的開頭或結尾為一或多個空白字元,許多伺服器都不支援包含空白字元的密碼。"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"正在擷取帳戶資訊…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"正在驗證伺服器設定…"</string>
     <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_names_title" msgid="8780121351085082269">"帳戶設定"</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>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"這個欄位不能留空。"</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"帳戶設定"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"帳戶類型"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"帳戶類型為何?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"帳戶設定"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"內送伺服器設定"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"使用者名稱"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"密碼"</string>
@@ -92,18 +126,21 @@
     <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>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"帳戶設定"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"外寄伺服器設定"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"SMTP 伺服器"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"通訊埠"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"安全性類型"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"要求登入"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"使用者名稱"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"密碼"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"用戶端憑證"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"選取"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"使用用戶端憑證"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"移除"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"無"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"行動裝置 ID"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"帳戶設定"</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>
@@ -129,6 +166,7 @@
     <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_fmt" msgid="8811464534757505457">"登入失敗。\n(<xliff:g id="ERROR">%s</xliff:g>)"</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>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"遠端安全性管理"</string>
     <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="account_setup_username_uneditable_error" msgid="3607769783124215764">"您無法變更帳戶的使用者名稱。如要以其他使用者名稱新增帳戶,請輕觸 [新增帳戶]。"</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"警告:如果停用「電子郵件」應用程式的裝置管理權限,系統將刪除所有需要使用這項權限的「電子郵件」帳戶,以及帳戶中所有的電子郵件、聯絡人、日曆活動和其他資料。"</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>
@@ -168,6 +207,9 @@
     <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> 的資料已從您的裝置中清除,如要還原這些資料,請變更螢幕上鎖 PIN 或密碼,要立即變更嗎?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"要捨棄尚未儲存的變更?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"無法登入"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"<xliff:g id="ACCOUNT">%s</xliff:g> 的使用者名稱或密碼不正確。您要現在更新嗎?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"您無法登入 <xliff:g id="ACCOUNT">%s</xliff:g> (伺服器顯示訊息:<xliff:g id="REASON">%s</xliff:g>)。您要更新使用者名稱和/或密碼嗎?"</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>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"同步處理這個帳戶的日曆活動"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"同步處理電子郵件"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"同步處理此帳戶的電子郵件"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"震動"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"震動"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"選擇鈴聲"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"伺服器設定"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"同步處理選項"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"同步處理這個資料夾"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"連線時會下載郵件"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"同步處理下列天數的郵件量"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"寄件者圖片"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"只有部分包含 POP 存取功能的「Plus」帳戶能與這個程式連線。如果您輸入的電子郵件地址和密碼無誤,卻仍無法登入,表示您可能尚未購買「Plus」帳戶。請啟動網頁瀏覽器,以存取這些電子郵件帳戶。"</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"設定這個電子郵件帳戶前,請先造訪 T-Online 網站,並設定 POP3 電子郵件收發功能的密碼。"</string>
+    <string name="exchange_name" msgid="3793803477985438102">"公司"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"無法建立帳戶,請再試一次。"</string>
     <string name="device_admin_label" msgid="3335272972461391415">"電子郵件"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"啟用伺服器專用安全性政策"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"設定"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"一般設定"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"刪除前需確認"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"傳送前需確認"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"搜尋電子郵件"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"不允許使用裝置相機"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"需要裝置密碼"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"限制重複使用最近用過的密碼"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"這主意不錯!"</string>
     <string name="quick_3" msgid="8070999183033184986">"我稍晚看過後回覆您。"</string>
     <string name="quick_4" msgid="216066940197616025">"開會討論吧!"</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"系統會在漫遊時停用這個帳戶的背景同步處理。"</string>
     <string name="confirm_response" msgid="6764021931370809514">"正在傳送回應…"</string>
-    <string name="imap_name" msgid="8285222985908214985">"個人 (IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"個人 (POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"沒有任何郵件。"</string>
+    <string name="imap_name" msgid="1267915719183915252">"IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"資料夾選取工具"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"選取 <xliff:g id="ACCOUNT">%s</xliff:g> 伺服器的垃圾桶資料夾"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"選取 <xliff:g id="ACCOUNT">%s</xliff:g> 伺服器的寄件備份資料夾"</string>
     <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>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 08220d4..d0a0f24 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -21,28 +21,57 @@
     <string name="permission_access_provider_label" msgid="977700184037298723">"Finyelela kwimininingo yomhlinzeki we-imeyli"</string>
     <string name="permission_access_provider_desc" msgid="5338433949655493713">"Ivumela lolu hlelo lokusebenza ukufinyelela kumininingo yakho egciniwe ye-Imeyili, kuhlanganise imiyalezo etholiwe, imiyalezo ethunyelwe, amagama abasebenzisi kanye namaphasiwedi."</string>
     <string name="app_name" msgid="2206468539066258195">"I-imeyli"</string>
+    <string name="debug_title" msgid="1337476992195531309">"Lungisa iphutha"</string>
     <string name="create_action" msgid="6575946089819721958">"Yenza okusha"</string>
     <string name="quick_responses_empty_view" msgid="3394094315357455290">"Azikho izimpendulo ezisheshayo."</string>
     <string name="account_settings_action" msgid="589969653965674604">"Izilungiselelo ze-akhawunti"</string>
+    <string name="status_network_error" msgid="526826323872477973">"Inkinga yoxhumano"</string>
+  <plurals name="move_messages">
+    <item quantity="one" msgid="3431489066510898753">"Khipha umyalezo"</item>
+    <item quantity="other" msgid="5083310421670206821">"Khipha imiyalezo"</item>
+  </plurals>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="1687394290312755846">"Ukuhambisa akusekelwe kuma-akhawunti e-POP3"</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="1032577153519440211">"Ayikwazi ukukhipha ngoba okukhethiwe kuqukethe ama-akhawunti ahlukene."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="3758109129023839909">"Imilayezo Esazolungiswa, Ebhokisini lemilayezo Ephumayo kanye Nethunyelwe ayikwazi ukukhishwa."</string>
     <string name="mailbox_name_display_inbox" msgid="5093068725739672126">"Ibhokisi lokungenayo"</string>
     <string name="mailbox_name_display_outbox" msgid="8735725798805339414">"Ibhokisi lemiyalezo ephumayo"</string>
     <string name="mailbox_name_display_drafts" msgid="3552043116466269581">"Okungaphelele"</string>
     <string name="mailbox_name_display_trash" msgid="7020792045007681852">"Udoti"</string>
     <string name="mailbox_name_display_sent" msgid="6705058612006729985">"Thunyelwe"</string>
     <string name="mailbox_name_display_junk" msgid="1634126984313831675">"Okungafuneki"</string>
-    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Okunenkanyezi"</string>
+    <string name="mailbox_name_display_starred" msgid="8076384721309828453">"Okunenkanyizo"</string>
     <string name="mailbox_name_display_unread" msgid="1453575937919310339">"Akufundiwe"</string>
-    <string name="debug_title" msgid="1337476992195531309">"Lungisa iphutha"</string>
+    <string name="account_folder_list_summary_inbox" msgid="6524816019350737506">"Ibhokisi lokungenayo"</string>
+    <string name="account_folder_list_summary_starred" msgid="1625089431195748236">"Okunenkanyezi"</string>
+    <string name="account_folder_list_summary_drafts" msgid="4050225674547841762">"Okungaphelele"</string>
+    <string name="account_folder_list_summary_outbox" msgid="5594504984407654721">"Ibhokisi lemiyalezo ephumayo"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="4155918930481733669">"Ukubuka okuhlanganisiwe"</string>
     <string name="message_compose_fwd_header_fmt" msgid="6193988236722150221">\n\n"-------- Umyalezo Wangempela --------\nIsihloko: <xliff:g id="SUBJECT">%1$s</xliff:g>\nKusuka ku: <xliff:g id="SENDER">%2$s</xliff:g>\nKuya ku: <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">"Faka izimpendulo ezisheshayo"</string>
     <string name="message_compose_insert_quick_response_menu_title" msgid="4393288554605333619">"Faka impendulo esheshayo"</string>
     <string name="message_view_attachment_background_load" msgid="7571652141281187845">"Eyodwa noma eyengeziwe yezinamathiseli kumlayezo wakho odluliselwe izolandwa ngaphambi kokuthumelwa."</string>
+    <string name="attachment_not_found" msgid="5219773045406833000">"Yehlulekile ukulondoloza okunamathiselwe kwi-imeyili."</string>
     <string name="message_decode_error" msgid="91396461771444300">"Bekunephutha ngesikhathi kulungiswa umlayezo."</string>
     <string name="forward_download_failed_ticker" msgid="2900585518884851062">"Ayikwazi ukudlulisa isinamathiseli esisodwa noma ezengeziwe"</string>
     <string name="forward_download_failed_title" msgid="2043036709913723298">"Okunamathiselwa kwi-imeyli akuthunyelwanga"</string>
     <string name="login_failed_ticker" msgid="4620839194581484497">"I-<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ingene ngemvume ngempumelelo."</string>
     <string name="login_failed_title" msgid="1737884069957090004">"Ayikwazanga ukungena ngemvume."</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="884086921379532485">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="1883360269853654045">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="7735927556589634941">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="7476806336055136146">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7755624135347953938">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="3317120193748830799">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="5180812866869430241">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1607574223219436099">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
     <string name="account_setup_basics_title" msgid="5050895656741229172">"Ukumisa i-akhawunti"</string>
     <string name="oauth_authentication_title" msgid="3771260531636603518">"Icela ukugunyaza"</string>
     <string name="sign_in_title" msgid="5051852806423550830">"Ngena ngemvume"</string>
@@ -64,17 +93,22 @@
     <string name="account_setup_username_password_toast" msgid="3659744829670065777">"Sicela uthayiphe ikheli le-imeyili elilungile kanye nephasiwedi."</string>
     <string name="account_duplicate_dlg_title" msgid="3768813340753269695">"I-akhawunti Ephindiwe"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6747351773934787126">"Usuvele usebenzisa leli gama lomsebenzisi kule akhawunti \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_password_spaces_error" msgid="1035535222734047745">"Le phasiwedi iqala noma igcina ngezimpawu"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="9103280616618316032">"Ilanda ulwazi le-akhawunti..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="9196418179524308411">"Iqinisekisa izilungiselelo zeseva…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="9062019904409225329">"Iqinisekisa izilungiselelo ze-smtp…"</string>
     <string name="account_setup_creating_account_msg" msgid="2898648422471181490">"Idala i-akhawunti…"</string>
     <string name="account_setup_ab_headline" msgid="1434091698882290052">"Qinisekisa uhlobo lwe-akhawunti yakho"</string>
     <string name="account_setup_ab_instructions_format" msgid="6223657094843768202">"Ukhombe i-<xliff:g id="EMAIL">%1$s</xliff:g> isebenzisa u-<xliff:g id="USERPROTOCOL">%2$s</xliff:g>, kodwa i-akhawunti ingase isebenzisa u-<xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
+    <string name="account_setup_names_title" msgid="8780121351085082269">"Ukumisa i-akhawunti"</string>
     <string name="account_setup_names_headline" msgid="2031978210683887370">"I-akhawunti yakho imisiwe, futhi i-imeyli isendleleni!"</string>
     <string name="account_setup_names_account_name_label" msgid="3487538709712378441">"Nike le-akhawunti igama (okokuzikhethela)"</string>
     <string name="account_setup_names_user_name_label" msgid="4298006111315033499">"Igama lakho (liboniswa emiyalezweni ephumayo)"</string>
+    <string name="account_setup_names_user_name_empty_error" msgid="602103532054000846">"Lesi sikhundla akumele singabi nalutho."</string>
+    <string name="account_setup_account_type_title" msgid="7081511430549429621">"Ukumisa i-akhawunti"</string>
     <string name="account_setup_account_type_headline" msgid="3375795537675351389">"Uhlobo lwe-akhawunti"</string>
     <string name="account_setup_account_type_instructions" msgid="968088954656738617">"Yiluphi uhlobo lwe-akhawunti lolu?"</string>
+    <string name="account_setup_incoming_title" msgid="7743750350830383718">"Ukumisa i-akhawunti"</string>
     <string name="account_setup_incoming_headline" msgid="6232828824446177639">"Izilungiselelo zeseva engenayo"</string>
     <string name="account_setup_incoming_username_label" msgid="2609699829997945895">"IGAMA LOMSEBENZISI"</string>
     <string name="account_setup_incoming_password_label" msgid="4806105500058512876">"IPHASIWEDI"</string>
@@ -92,18 +126,21 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="8677018382715596606">"Lapho ngisusa Ebhokisini lokungenayo"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="3531290378620033218">"Isiqalo sendlela ye-IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="206747922689229932">"Inketho"</string>
+    <string name="account_setup_outgoing_title" msgid="2808821899038184783">"Ukumisa i-akhawunti"</string>
     <string name="account_setup_outgoing_headline" msgid="6638171491109658047">"Izilungiselelo zeseva eziphumayo"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="3460163861711242681">"ISEVA YE-SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="3735952013505812378">"IMBOBO"</string>
     <string name="account_setup_outgoing_security_label" msgid="6473177134731615282">"UHLOBO LWEZOKUPHEPHA"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="5405196721947884033">"Kudingeka ukungena ngemvume"</string>
     <string name="account_setup_outgoing_username_label" msgid="8844680398828891772">"IGAMA LOMSEBENZISI"</string>
+    <string name="account_setup_outgoing_password_label" msgid="112570779839746136">"IPHASIWEDI"</string>
     <string name="account_setup_exchange_certificate_title" msgid="8756785660598838350">"ISITIFIKETI SEKHASIMENDE"</string>
     <string name="account_setup_exchange_select_certificate" msgid="264748505181695915">"Khetha"</string>
     <string name="account_setup_exchange_use_certificate" msgid="6513687497912094538">"Sebenzisa isitifiketi sekhasimende"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="1222387802827919583">"Susa"</string>
     <string name="account_setup_exchange_no_certificate" msgid="3569712401698909695">"Lutho"</string>
     <string name="account_setup_exchange_device_id_label" msgid="2306603503497194905">"I-ID YEDIVAYISI YESELULA"</string>
+    <string name="account_setup_options_title" msgid="3274463434235489134">"Izilungiselelo ze-akhawunti"</string>
     <string name="account_setup_options_headline" msgid="4810292194395251968">"Okukhethwa kukho kwe-akhawunti"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="7253305392938373553">"Imvamisa yokuvumelanisa"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="2937664246354067829">"Akusoze"</string>
@@ -129,6 +166,7 @@
     <string name="account_setup_options_mail_window_all" msgid="4794683936065721438">"Konke"</string>
     <string name="account_setup_options_mail_window_default" msgid="5518038139722596598">"Sebenzisa okuzenzakalelayo kwe-akhawunti"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="5608549872868036352">"Igama lakho lomsebenzisi noma iphasiwedi ayilungile."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8811464534757505457">"Ukuqinisekiswa akuphumelelanga.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7551559109838593189">"Inkinga ngokusetha i-akhawunti"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="4075075565221436715">"Qinisekisa ukuthi igama lomsebenzisi, iphasiwedi, nezilungiselelo ze-akhawunti kulungile."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="4725950885859654809">"Ayikwazi ukuxhuma ngokuphephile kwiseva."</string>
@@ -147,6 +185,7 @@
     <string name="account_setup_security_required_title" msgid="667943309546419435">"Ukuphatha ukuphepha kokulawula okukude"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="9029471168291631932">"Iseva<xliff:g id="SERVER">%s</xliff:g> idinga ukuba uyivumele ukuba ilawule kude ezinye izici zokuphepha zedivayisi ye-Android yakho.  Ingabe ufuna ukuqedela ukumisa le-akhawunti?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4619685657253094627">"Le seva idinga izici zokuphepha ezingasekelwa idivayisi yakho ye-Android, kuhlanganisa: <xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_username_uneditable_error" msgid="3607769783124215764">"Awukwazi ukushintsha igama lomsebenzi le-akhawunti. Ukuze wengeze i-akhawunti ngegama lomsebenzi elihlukile, thinta Engeza I-akhawunti."</string>
     <string name="disable_admin_warning" msgid="6001542250505146252">"ISEXWAYISO: Yenza kungasebenzi imvume yohlelo lokusebenza lwe-Imeyli ukubhalisa idivaysi yakho kuzosusa wonke ama-akhawunti e-Imeyli ayidingayo, kuhlanganise ne-imeyli yayo, othintana nabo, amakhalenda, izenzakalo, neminye imininingo."</string>
     <string name="account_security_dialog_title" msgid="7003032393805438164">"Okwakamuva kwezokuphepha"</string>
     <string name="account_security_dialog_content_fmt" msgid="4107093049191103780">"<xliff:g id="ACCOUNT">%s</xliff:g> idinga ubuyekeze izilungiselelo zakho zokuphepha."</string>
@@ -168,6 +207,9 @@
     <string name="password_expired_dialog_title" msgid="7275534155170185252">"Iphasiwedi yokuvala isikrini iphelelwe isikhathi"</string>
     <string name="password_expired_dialog_content_fmt" msgid="8322213184626443346">"Idatha le-<xliff:g id="ACCOUNT">%s</xliff:g> lisuliwe kudivayisi. Ungalibuyisa ngokushintsha i-PIN yakho yokukhiya isikrini noma iphasiwedi. Ufuna ukuyishintsha manje?"</string>
     <string name="account_settings_exit_server_settings" msgid="4232590695889111419">"Lahla izinguquko ezingagciniwe?"</string>
+    <string name="account_settings_login_dialog_title" msgid="2250911725501042470">"Ayikwazanga ukungena ngemvume."</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8687412692709766495">"Igama lomsebenzisi noma iphasiwedi ye-<xliff:g id="ACCOUNT">%s</xliff:g> ayilungile. Ufuna ukuzivuselela manje?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="2324678262137130809">"Ukungena kwakho ngemvume ku-<xliff:g id="ACCOUNT">%s</xliff:g> akuphumelelanga; iseva ithe: <xliff:g id="REASON">%s</xliff:g> Ingabe ufuna ukubuyekeza igama lomsebenzisi kanye/noma iphasiwedi yakho?"</string>
     <string name="account_settings_background_attachments_label" msgid="3552681465680701047">"Layisha ngokungenisa okunamathelayo"</string>
     <string name="account_settings_background_attachments_summary" msgid="8801504001229061032">"Dawuniloda ngokuzenzakalla ukunamathiseleka emiyalezweni yakamuva nge-Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="8621226576645167987">"Izaziso ze-Imeyli"</string>
@@ -206,7 +248,7 @@
     <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Vumelanisa umcimbi wekhalenda kule akhawunti"</string>
     <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Vumelanisa i-imeyli"</string>
     <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Vumelanisa i-imeyli yale akhawunti"</string>
-    <string name="label_notification_vibrate_title" msgid="140881511322826320">"Dlidliza"</string>
+    <string name="label_notification_vibrate_title" msgid="361069844540266098">"Dlidliza"</string>
     <string name="account_settings_ringtone" msgid="2238523918221865167">"Khetha ithoni yokukhala"</string>
     <string name="account_settings_servers" msgid="3386185135392642067">"Izilungiselelo zeseva"</string>
     <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Vumelanisa okukhethwa kukho"</string>
@@ -214,11 +256,20 @@
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"Vumelanisa le folda"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"Imilayezo izolanda uma kuxhunyiwe"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"Izinsuku ze-imeyili ukuya ekuvumelaniseni"</string>
+    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"Isithombe somthumeli"</string>
+    <string name="provider_note_live" msgid="4289035326060391547">"Kuphela amanye ama-akhawunti \"Okuhlanganisa\" ahlanganisa ukufinyelela i-POP okuvumela lolu hlelo ukuxhuma. Uma ungakwazi ukungena ngekheli lakho le-imeyili elilungile kanye nephasiwedi, kungase kwenzeke awunayo i-akhawunti ekhokhelwe \"Hlanganisa\". Sicela uqalise isipheqululis seWebhu ukuthola ukufinyelela kulama akhawunti e-imeyili."</string>
     <string name="provider_note_t_online" msgid="1596701148051980218">"Ngaphambi kokuhlela le-akhawunti ye-imeyili, sicela uvakashele Iwebhusayithi ye-T-Online bese wenza iphasiwedi ukufinyelela kwi-imeyili ye-POP3."</string>
+    <string name="exchange_name" msgid="3793803477985438102">"Inhlangano"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Ukuvumelanisa Okusebenzayo Kokushintshanisa kwe-Microsoft"</string>
     <string name="system_account_create_failed" msgid="2248313263003927725">"Ayikwazanga ukwenza i-akhawunti. Zama futhi."</string>
     <string name="device_admin_label" msgid="3335272972461391415">"I-imeyli"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"Ivumela izinqubomgomo zokuphepha eziqondene neseva"</string>
+    <string name="settings_activity_title" msgid="4787565736829092053">"Izilungiselelo"</string>
+    <string name="header_label_general_preferences" msgid="2924944721204930254">"Izilungiselelo ezijwayelekile"</string>
+    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"Qinisekisa ngaphambi kokususa"</string>
+    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"Qinisekisa ngaphambi kokuthumela"</string>
+    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
+    <string name="search_hint" msgid="3491349343647799436">"Sesha i-imeyli"</string>
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"Ungavumeli ukusebenza kwekhamera yedivayisi"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"Dinga iphasiwedi yedivayisi"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"Khawulela ukusetshenziswa kabusha kwamaphasiwedi wakamuva"</string>
@@ -230,13 +281,15 @@
     <string name="quick_2" msgid="8611591278119481491">"Kuzwaka kukuhle kimi!"</string>
     <string name="quick_3" msgid="8070999183033184986">"Ngizofunda lokho emvakwesikhashana."</string>
     <string name="quick_4" msgid="216066940197616025">"Masihlele umhlangano ukuxoxisana ngalokhu."</string>
+    <string name="require_manual_sync_message" msgid="7361932179783481686">"Ukuvumelaniswa okungemumva kule-akhawunti ayisebenzi ngesikhathi usazula zula."</string>
     <string name="confirm_response" msgid="6764021931370809514">"Ithumela impendulo..."</string>
-    <string name="imap_name" msgid="8285222985908214985">"Okomuntu siqu (I-IMAP)"</string>
-    <string name="pop3_name" msgid="6653484706414263493">"Okomuntu siqu (I-POP3)"</string>
+    <string name="no_conversations" msgid="3785854971159919343">"Ayikho imilayezo."</string>
+    <string name="imap_name" msgid="1267915719183915252">"I-IMAP"</string>
+    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
+    <string name="folder_picker_title" msgid="5906275472176731605">"Isikhethi sefolda"</string>
     <string name="trash_folder_selection_title" msgid="686039558899469073">"Khetha ifolda kadoti yeseva ye-<xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"Khetha ifolda yezinto ezithunyele ye-<xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"Ilayisha uhlu lwamafolda…"</string>
     <string name="no_quick_responses" msgid="8716297053803961304">"Lutho olutholakalayo"</string>
     <string name="gmail_name" msgid="2099786953868369991">"I-Gmail"</string>
-    <string name="folder_sync_settings_pref_title" msgid="349478353401667107">"Izilungiselelo zokuvumelanisa ifolda"</string>
 </resources>