DO NOT MERGE: Move emailcommon2 sources to emailcommon

Change-Id: I06df7e467cd2e0117df8b8db3ddc6ff9da13f1c7
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 358d096..72a0e35 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -17,9 +17,9 @@
 <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="9208086010625033590">"Funda okunamathiselwe kwi-imeyili"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Ivumela lolu hlelo lokusebenza ukuba lufunde izinamathiseli zakho ze-imeyli."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Ivumela i-app ukufunda okunamathiselwe kwe-imeyili yakho."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Finyelela kwimininingo yomhlinzeki we-imeyli"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Ivumela lolu hlelo lokusebenza ukufinyelela kumininingo yakho egciniwe ye-Imeyili, kuhlanganise imiyalezo etholiwe, imiyalezo ethunyelwe, amagama abasebenzisi kanye namaphasiwedi."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"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="5815426892327290362">"I-imeyli"</string>
     <string name="compose_title" msgid="427986915662706899">"Bhala"</string>
     <string name="debug_title" msgid="5175710493691536719">"Lungisa iphutha"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Kwenziwe"</string>
     <string name="create_action" msgid="3062715563215392251">"Yenza okusha"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Susa"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Azikho izimpendulo ezisheshayo"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Azikho izimpendulo ezisheshayo."</string>
     <string name="discard_action" msgid="6532206074859505968">"Lahla"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Londoloza okusazolungiswa"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Faka impendulo esheshayo"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Sesha"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Izilungiselelo ze-akhawunti"</string>
     <string name="settings_action" msgid="6334807007967459412">"Izilungiselelo"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Vumelanisa okukhethwa kukho"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Vumelanisa okukhethwa kukho"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Maka njengokungafundiwe"</string>
     <string name="move_action" msgid="3059189775933985898">"Khipha"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>ubhale:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Hlanganisa umbhalo ocashuniwe"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Hlanganisa umbhalo"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Kumelwe wengeze okungenani umamukeli oyedwa."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Ngeza okungenani umamukeli oyedwa."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Amanye amakheli e-imeyili awalungile."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Ifayela inkulu kakhulu ukuba inamathiselwe."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Faka izimpendulo ezisheshayo"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Kulondoloziwe"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Misa"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Isinamathiseli silondolozwe njenge-<xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Yehlulekile ukulondoloza okuxhunyiwe."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Yazi: Eyodwa noma eyengeziwe yezinamathiseli kumyalezo wakho odluliselwe izolandwa ngaphambi kokuthumelwa."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Ayikwazanga ukugcina okunamathiselwe."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Eyodwa noma eyengeziwe yezinamathiseli kumlayezo wakho odluliselwe izolandwa ngaphambi kokuthumelwa."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Umyalezo"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Mema..."</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Ayikwazi ukudlulisa isinamathiseli esisodwa noma ezengeziwe"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Okunamathiselwa kwi-imeyli akuthunyelwanga"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ukungena ngemvume kwehlulekile"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"I-<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ingene ngemvume ngempumelelo."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Ayikwazanga ukungena ngemvume."</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Okudadlana"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Ukumisa i-akhawunti"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Yengeza i-akhawunti Yokushintshanisa"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Yengeza i-akhawunti Yokuvumelanisa Okusebenzsayo Kokushintshanisa"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"I-akhawunti ye-Imeyli"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Ungase ulungisele ukusebenza i-imeyili yamanye ama-akhawunti ngezinyathelo ezimbalwa."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Ungamisa i-akhawunti ye-Exchange ngezinyathelo ezimbalwa nje."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Ungamisa i-akhawunti ye-Exchange ActiveSync ngezinyathelo ezimbalwa nje."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Ungasetha i-akhawunti yakho ngezinyathelo ezimbalwa."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Ikheli le-imeyli"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Iphasiwedi"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Thumela i-imeyli kusuka kule akhawunti ngokuzenzakalelayo"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Thumela i-imeyli kusuka kule akhawunti ngokwakhona"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ukumisela"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Sicela uthayiphe ikheli le-imeyili elilungile kanye nephasiwedi."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"I-akhawunti Ephindiwe"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Ihlola izilungiselelo zesiphakeli ezingenayo..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Ihlola izilungiselelo zesiphakeli eziphumayo..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Ukumisa i-akhawunti"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"I-akhawunti yakho imisiwe, futhi i-imeyli isendleleni!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"I-akhawunti yakho imisiwe, futhi i-imeyli isendleleni!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nike le-akhawunti igama (okokuzikhethela)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Igama lakho (liboniswa emiyalezweni ephumayo)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Lesi sikhundla akumele singabi nalutho."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Izilungiselelo zeseva engenayo"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Igama lomsebenzisi"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Iphasiwedi"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Iseva ye-POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Iseva ye-IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Isiphakeli"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Imbobo yokuxhuma"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Uhlobo lokuphepha"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Lutho"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Iseva ye-SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Imbobo yokuxhuma"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Uhlobo lokuphepha"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Dinga ukungena."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Kudingeka ukungena ngemvume"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Igama lomsebenzisi"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Iphasiwedi"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Ukuhlela i-akhawunti"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Njalo ngamaminithi angu-15"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Njalo ngamaminithi angu-30"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Njalo ngehora"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Thumela i-imeyli kusuka kule akhawunti ngokuzenzakalelayo"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Ngazise lapho i-imeyli ifika."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Vumelanisa othintana nabo kusuka kule akhawunti."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Vumelanisa ikhalenda kule akhawunti."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Vumelanisa i-imeyli kule akhawunti."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Thumela i-imeyli kusuka kule akhawunti ngokuzenzakalelayo"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Ngazise lapho i-imeyli ifika"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Vumelanisa othintana nabo kusuka kule akhawunti"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Vumelanisa ikhalenda kule akhawunti"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Vumelanisa i-imeyli kule akhawunti."</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Layisha okunamathiselwa kwi-imeyili ngokuzenzakalelayo uma uxhunyiwe kukuxhuma kungenazintambo"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ayikwazanga ukuqeda"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Izinsuku zokuvumelanisa"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Inyanga eyodwa"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Konke"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Sebenzisa okuzenzakalelayo kwe-akhawunti"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Igama lomsebenzisi noma iphasiwedi ayilungile."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Igama lomsebenzisi noma iphasiwedi ayilungile."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Igama lakho lomsebenzisi noma iphasiwedi ayilungile."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Igama lomsebenzisi noma iphasiwedi ayilungile."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Ayikwazi ukuxhuma ngokuphephile kwiseva."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Ayikwazi ukuxhuma ngokuphephile kwiseva. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Kudingeka isitifiketi sekhasimende. Xhuma esiphakelini ngesitifiketi sekhasimende?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Isitifiketi asivumelekile noma asingeneki"</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Iseva iphendule ngephutha, sicela uhlole igama lakho lomsebenzisi nephasiwedi bese uzama futhi."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Isititiketi seklayenti siyadingeka. Ingabe ufuna ukuxhuma kuseva ngesitifiketi seklayenti?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Isitifiketi asivumelekile noma asifinyeleleki."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Iseva iphendule ngephutha, sicela uhlole igama lakho lomsebenzisi nephasiwedi bese uzama futhi."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Ayikwazi ukuxhuma kwiseva."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Ayikwazi ukuxhuma kwiseva. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"I-TLS iyadingeka kodwa ayisekelwa iseva."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"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="430041952584831904">"Okwakamuva kwezokuphepha"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> idinga ukuba ubuyekeze izilungiselelo zakho zokuzivikela."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"i-Akhawunti \" <xliff:g id="ACCOUNT">%s</xliff:g> \" idinga ukubuyekeza izilungiselelo zokuphepha."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Ukubuyekeza kwezokuphepha kuyadingeka"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"I-Akhawuni \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ayikwazi ukuvumelanisa ngenxa yezimfuneko sokuphepha."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"I-Akhawunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" idinga ukubuyekeza izilungiselelo zokuphepha."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"I-Akhawunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ishintshe izilungiselelo zayo zokuphepha; asikho isenzo somsebenzisi esidingekayo."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Ukubuyekeza ezokuphepha kuyadingeka"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Izinqubomgomo zokuphepha zishintshiwe"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Izinqubomgomo zokuphepha azikwazi ukuhlangabezwa"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Ukuphepha kweDivaysi"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Iseva <xliff:g id="SERVER">%s</xliff:g> idinga ukuba uyivumele ukuba ilawule kude ezinye izici zokuphepha kwedivayisi ye-Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Hlela imininingwane"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Iphinikhodi noma iphasiwedi yakho yokuvala isikrini iphelelwe isikhathi."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Iphasiwedi yokuvala isikrini iphelelwe isikhathi"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Iphasiwedi yesikrini yokuvala iphelelwa isikhathi"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Kumele ushintshe iphinikhodi noma iphasiwedi yokuvala isikrini maduze, noma idatha ye-<xliff:g id="ACCOUNT">%s</xliff:g> izosulwa. Ishintshe manje?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Udinga ukushintsha i-PIN yesikrini sakho sokukhuya noma iphasiwedi ngokushesha, noma idatha ye-<xliff:g id="ACCOUNT">%s</xliff:g> izosulwa. Ufuna ukuyishintsha manje?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Iphasiwedi yokuvala isikrini iphelelwe isikhathi"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Idatha ye-<xliff:g id="ACCOUNT">%s</xliff:g> iyasulwa kudivayisi yakho. Ungayibuyisa ngokushintsha iphinikhodi yakho yokuvala isikrini noma iphasiwedi. Ishintshe manje?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"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="8006323251094711431">"Lahla izinguquko ezingagciniwe?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Ayikwazanga ukungena ngemvume."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Igama lomsebenzisi noma iphasiwedi ye-<xliff:g id="ACCOUNT">%s</xliff:g> ayilungile. Wabuyekeze manje?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Igama lomsebenzisi noma iphasiwedi ye-<xliff:g id="ACCOUNT">%s</xliff:g> ayilungile. Ufuna ukuzivuselela manje?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"I-akhawunti ezenzakalelayo"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Thumela i-imeyli kusuka kule akhawunti ngokuzenzakalelayo"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Layisha ngokungenisa okunamathelayo"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Dawuniloda ngokuzenzakalla ukunamathiseleka emiyalezweni yakamuva nge-Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Izaziso ze-Imeyli"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Ukuvama kokuvumelanisa, isaziso, nokunye."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Ngazise Kusistimu ochaza ngesimo uma i-imeyli ifika"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Thumela isaziso uma i-imeyili ifika"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Ukuvama ukuhlola ibhokisi lemiyalezo engenayo"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Izilungiselelo ezingenayo"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Igama lombebenzisi, iphasiwedi, nezinye izilungiselelo zeseva ezingenayo"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Izilungiselelo eziphumayo"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Igama lomsebenzisi, iphasiwedi, nezinye izilungiselelo zeseva eziphumayo"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Izinqubomgomo ziphoqiwe"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Lutho"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Izinqubomo ezingasekelwe"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Lutho"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Zama ukuvumelanisa"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Thinta lapha ukuze uvumelanise le akhawunti"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Igama le-akhawunti"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Igama lakho"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Isiginesha"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Izimpendulo ezisheshayo"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Hlela umbhalo owusebenzisa njalo uma ubhala ama-imeyli"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Hlela umbhalo owusebenzisa njalo uma ubhala ama-imeyli"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Jobelela umbhalo emiyalezweni oyithumelayo"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Izilungiselelo zesaziso"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Ukusebenzisa idatha"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Izinqubomgomo zokuphepha"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Hlela izimpendulo ezisheshayo"</string>
     <string name="save_action" msgid="1988862706623227093">"Londoloza"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Vumelanisa othintana nabo"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Vumelanisa othintana nabo bale akhawunti"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Vumelanisa Ikhalenda"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Vumelanisa ikhalenda yale akhawunti"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Vumelanisa ikhalenda"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Vumelanisa umcimbi wekhalenda kule akhawunti"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Vumelanisa i-imeyli"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Vumelanisa i-imeyli yale akhawunti"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Dlidliza"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> imiphumela ephuma <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Izilungiselelo"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Okuvamile"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Izilungiselelo ezijwayelekile"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Uhlelo lokusebenza"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Okuseqophelweni okuzenzakalelayo"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Khetha ukuthi isiphi isikrini esizoboniswa emuva kokuba ususe umyalezo"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Fihla amabhokisi okuhlola"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Ezinhlwini zemilayezo, thinta bese ubamba ukuze ukhethe"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Qinisekisa ngaphambi kokususa"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Imilayezo"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Qinisekisa ngaphambi kokuthumela"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Imilayezo"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Dlulela ku"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Umyalezo omusha"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Umyalezo wakudala"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Ilinde imiphumela"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Amanye amaseva angathatha isikhathi eside."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Amafolda"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Ungavumeli ukusebenza kwekhamera yedivayisi"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Idinga iphasiwedi yedivayisi"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Khawulela ukusetshenziswa kabusha kwamaphasiwedi wakamuva"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Cela ukuthi amaphasiwedi aphalwe isikhathi"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Dinga idivayisi yokumisa ukukhiya isikrini sayo"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Khawulela inombolo yemicimbi yekhalenda evunyelanisiwe"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Khawulela inombolo yama-imeyili avumelanisiwe"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Siyabonga!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Kuzwaka kukuhle kimi!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Ngizofunda lokho emvakwesikhashana."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Masihlele umhlangano ukuxoxisana ngalokhu."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Ukuvumelaniswa okungemumva kule-akhawunti ayisebenzi ngesikhathi usazula zula."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Thumela impendulo..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Ayikho imilayezo."</string>
 </resources>