DO NOT MERGE: Move emailcommon2 sources to emailcommon

Change-Id: I06df7e467cd2e0117df8b8db3ddc6ff9da13f1c7
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d222eac..7600881 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/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">"Soma viambatisho vya barua pepe"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Inaruhusu programu hii kusoma viambatisho vyako vya barua pepe."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Inaruhusu programu kusoma viambatisho vya barua pepe yako."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Fikia data ya mtoa huduma wa barua pepe"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Huruhusu programu hii kufikia hifadhidata yako ya barua pepe, pamoja na ujumbe uliopokewa, ujumbe uliotumwa, majina ya mtumiaji na nenosiri."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Inaruhusu programu hii kufikia hifadhidata yako ya barua pepe, ikiwa ni pamoja na jumbe zilizopokewa, jumbe zilizotumwa, majina ya mtumiaji na manenosiri."</string>
     <string name="app_name" msgid="5815426892327290362">"Barua pepe"</string>
     <string name="compose_title" msgid="427986915662706899">"Tunga"</string>
     <string name="debug_title" msgid="5175710493691536719">"Tatua"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Kwisha"</string>
     <string name="create_action" msgid="3062715563215392251">"Unda mpya"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Futa"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Hakuna majibu ya haraka"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Hakuna majibu ya haraka."</string>
     <string name="discard_action" msgid="6532206074859505968">"Tupa"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Hifadhi rasimu"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Ingiza jibu la haraka"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Tafuta"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Mipangilio ya akaunti"</string>
     <string name="settings_action" msgid="6334807007967459412">"Mipangilio"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Chaguo za kusawazisha"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Chaguo za ulandanishi"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Tia alama kuwa haijasomwa"</string>
     <string name="move_action" msgid="3059189775933985898">"Hamisha"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Nakala kwa/Nakala fiche kwa"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> aliandika:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Jumuisha maandishi yaliyonukuliwa"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Jumuisha maandishi"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Ni lazima uongeze angalau mpokeaji mmoja"</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Ongeza angalau mpokeaji mmoja."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Anwani zingine za barua pepe ni batili."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Faili ni kubwa sana kuambatishwa."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Ingiza majibu ya haraka"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Imehifadhiwa"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Simamisha"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Kiambatisho kimehifadhiwa kama <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Haikuweza kuhifadhi kiambatisho."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Zingatia: Moja au zaidi ya viambatisho katika ujumbe wako uliosambazwa vitapakuliwa kabla ya kutumwa."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Haikuweza kuhifadhi kiambatisho."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Kiambatisho kimoja au zaidi katika ujumbe wako uliosambazwa kitapakuliwa kabla ya kutumwa."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Ujumbe"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Alika"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Haikuweza kusambaza kiambatisho kimoja au zaidi."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Kiambatishho hakijasambazwa"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ilishindwa kuingia."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Kuingia <xliff:g id="ACCOUNT_NAME">%s</xliff:g> hakujafaulu."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Haingeweza kuingia"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"B <xliff:g id="SIZE_IN_BYTES">%d</xliff:g>"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Nzee zaidi"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Usanidi wa akaunti"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Ongeza akaunti ya Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Ongeza akaunti ya Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Akaunti ya barua pepe"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Unaweza kusanidi barua pepe ya akaunti nyingi kwa hatua chache tu."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Unaweza kusanidi akaunti ya Exchange kwa hatua chache tu."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Unaweza kusanidi akaunti ya Exchange ActiveSync kwa hatua chache tu."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Unaweza kusanidi akaunti yako katika hatua chache tu."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Anwani ya barua pepe"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Nenosiri"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Tuma barua pepe kutoka kwa akaunti hii kama chaguo-msingi"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Tuma barua pepe kutoka kwa akaunti hii kama chaguo-msingi"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Usanidi wa mkono"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Tafadhali andika anwani na nenosiri halali ya barua pepe."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Akaunti Rudufu"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Inakagua mipangilio ya seva inayoingia..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Inakagua mipangilio ya seva inayotoka nje..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Usanidi wa akaunti"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Akaunti yako imesanidiwa, na barua pepe iko njiani!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Akaunti yako imesanidiwa, na barua pepe iko njiani!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ipe akaunti hii jina (ya hiari)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Jina lako (linaloonyeshwa kwenye ujumbe unaotoka)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Uga hii haiwezi kuwa tupu."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Mipangilio ya seva ya kuingia"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Jina la mtumiaji"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Nenosiri"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Seva ya POP"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Seva ya IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Seva"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Mlango"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Aina ya usalama"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Hamna"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Seva ya SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Mlango"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Aina ya usalama"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Inahitaji uingie"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Inahitaji kuingia"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Jina la mtumiaji"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Nenosiri"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Usanidi wa akaunti"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Kila dakika 15"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Kila dakika 30"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Kila saa"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Tuma barua pepe kutoka kwa akaunti hii kama chaguo-msingi"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Niarifu wakati barua pepe inpoingia"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sawazisha anwani kutoka kwa akaunti hii."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sawazisha kalenda kutoka kwa akaunti hii."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sawazisha barua pepe kutoka kwa akaunti hii."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Tuma barua pepe kutoka kwa akaunti hii kama chaguo-msingi"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Niarifu wakati barua pepe inapowasili"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Landanisha anwani kutoka kwa akaunti hii"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Landanisha kalenda kutoka kwa akaunti hii"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Landanisha barua pepe kutoka kwa akaunti hii"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Pakua viambatisho kiotomatiki  wakati umeunganishwa kwenye mtandao-hewa"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Imeshindwa kumaliza"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Siku hadi Usawazishaji"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Mwezi mmoja"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Zote"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Tumia akaunti chaguo-msingi"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Jina la mtumiaji na nenosiri sio sahihi."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Jina la mtumiaji au nenosiri sio sahihi."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Jina la mtumiaji au nenosiri sio sahihi."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Jina la mtumiaji au nenosiri si sahihi."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Haiwezi kuunganisha kwa seva kwa usalama."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Haiwezi kuunganisha kwa seva kwa usalama."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Cheti cha mteja kinahitajika. Unganisha kwa seva na cheti cha mteja?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Cheti ni batili au hakiwezi kufikiwa."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Seva iliitikia na hitilafu; Kagua jina lako la mtumiaji na nenosiri na ujaribu tena."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Cheti cha mteja kinahitajika. Je, unataka kuunganisha kwenye seva na cheti cha mteja?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Cheti ni batili au hakiwezi kufikiwa."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Seva ilijibu na hitilafu. Kagua jina lako la mtumiaji na nenosiri, kisha ujaribu tena."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Haiwezi kuunganisha kwa seva."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Haiwezi kuunganisha kwa seva."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS inahitajika lakini haihimiliwi na seva."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"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="430041952584831904">"Usasisho wa usalama"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> inahitaji usasihe mipangilio yako ya usallama."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Akaunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" inahitaji kusasisha mipangilio ya usalama."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Uboreshaji wa usalama unahitajika"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Akaunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" haiwezi kulandanishwa kwa sababu ya mahitaji ya usalama."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Akaunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" inahitaji kusasisha mipangilio ya usalama."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Akaunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ilibadilisha mipangilio yakeya usalama; hakunahatuaya usalama inayohitajika."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Uboreshaji wa usalama unahitajika"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Sera za kiusalama zimebadilishwa"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Sera za kiusalama haziwezi kufikiwa"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Usalama wa kifaa"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Seva <xliff:g id="SERVER">%s</xliff:g>inahitaji uiruhusu kudhibiti kwa umbali baadhi ya vipengele vya usalama vya simu yako."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Hariri maelezo"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"PIN au nenosiri lako la kufunga skrini yako limekwisha muda."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Nenosiri la kufunga skrini limekwisha muda"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Nenosiri la kufunga skrini linaisha muda"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Lazima ubadilishe PIN yako ya skrini au nenosiri hivi karibuni, ama data ya <xliff:g id="ACCOUNT">%s</xliff:g> itafutwa. Ibadilishe saa hii?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Unahitaji kubadilisha PIN au nenosiri la kifungio skrini chako hivi karibuni, au data ya <xliff:g id="ACCOUNT">%s</xliff:g> itafutwa. Je, unataka kuibadilisha sasa?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Nenosiri la kufunga skrini limekwisha muda"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Data ya <xliff:g id="ACCOUNT">%s</xliff:g> inafutwa kutoka kwenye kifaa chako. Unaweza kuirejesha kwa kubadilisha PIN au nenosiri lako la kufunga skrini. Ibadilishe sasa?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"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="8006323251094711431">"Tupa mabadiliko yasiyohifadhiwa?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Haingeweza kuinga ndani"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Jina la mtumiaji au nenosiri la <xliff:g id="ACCOUNT">%s</xliff:g> si sahihi. Yasasishe saa hii?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"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_default_label" msgid="3575963379680943640">"Akaunti chaguo-msingi"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Tuma barua pepe kutoka kwa akaunti hii kwa chaguo-msingi"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Pakua viambatisho"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Pakua-otomatiki viambatisho kwa ujumbe wa hivi karibuni kupitia Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Arifa za barua pepe"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Mara za kusawazisha, kutuma arifa, n.k."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Arifu katika upau wa hali barua pepe inapofika"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Tuma arifa wakati barua pepe inafika"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Mazoea ya kukagua kikasha"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Mipangilio inayoingia"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Jina la mtumiaji, nenosiri, na mipangilio mingine ya seva inayoingia"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Mipangilio ya kutoka"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Jina la mmtumiaji, neneosiri na mipangilio mingine ya seva ya kutoka."</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Sera zimetekelezwa"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Hamna"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Sera zisizokubaliwa"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Hamna"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Jaribu usawazishi"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Gusa hapa ili kulandanisha akaunti hii"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Jina la akaunti"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Jina lako"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Sahihi"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Majibu ya haraka"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Hariri maandishi unayoyaingiza mara kwa mara unapoandika barua pepe"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Hariri maandishi unayoyaingiza mara kwa mara unapoandika barua pepe"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Ambatisha maandishi kwa ujumbe unaotuma"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Mipangilio ya Arifa"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Matumizi ya data"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Sera za kiusalama"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Hariri majibu ya haraka"</string>
     <string name="save_action" msgid="1988862706623227093">"Hifadhi"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sawazisha anwani"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sawazisha anwani za akaunti hii"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sawazisha Kalenda"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sawazisha kalenda ya akaunti hii"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sawazisha kalenda"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Landanisha tukio la kalenda la akaunti hii"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Landanisha barua pepe"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sawazisha barua pepe za akaunti hii"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Tetema"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> matokeo <xliff:g id="DOMAIN">%2$s</xliff:g> kutoka"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Mipangilio"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Kawaida"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Mipangilio ya kawaida"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Programu"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Kioto mahiri"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Chagua skrini gani ya kuonyesha baada ya kufuta ujumbe"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Ficha visanduku tiki"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Katika orodha ya jumbe, gusa na ushikilie ili uchague"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Thibitisha kabla ya kufuta"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Jumbe"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Thibitisha kabla ya kutuma"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Jumbe"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Mahiri katika"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Ujumbe mpya zaidi"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Ujumbe mzee zaidi"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Inasubiri matokeo"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Seva zingine zinaweza kuchukua muda mrefu."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Folda"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Usiruhusu matumizi ya kamera ya kifaa"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Zinahitaji nenosiri la kifaa"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Zuia matumizi mapya ya nywila ya hivi karibuni"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Inahitaji nywila kumalizika"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Inahitaji kifaa bwete ili kufunga skrini yake"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Wekea kikomo idadi ya matukio ya kalenda yanayolandanishwa"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Wekea kikomo idadi ya barua pepe zinazolandanishwa"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Asante!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Iko sawa kwangu!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Nitasoma hii baadaye na nitawasiliana na wewe."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Tupange mkutano wa kujadili hii."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Ulandanishi wa mandharinyuma ya akaunti hii imelemazwa wakati wa kuzurura."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Inatuma majibu..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Hakuna ujumbe."</string>
 </resources>