Import revised translations.

Change-Id: I0560d5aa478c7878a67e3047237d39a05676768e
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f11cd2c..62ec66a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -22,7 +22,7 @@
     <string name="permission_access_provider_desc" msgid="2549843731779487336">"Huruhusu programu hii kufikia hifadhidata yako ya barua pepe, pamoja na barua zilizopokewa, barua zilizotumwa, majina ya watumiaji 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">"Rekebisha"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Tatua"</string>
     <string name="next_action" msgid="3931301986364184415">"Ifuatayo"</string>
     <string name="okay_action" msgid="8365197396795675617">"Sawa"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Ghairi"</string>
@@ -57,7 +57,7 @@
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Ongeza Nakala kwa/Nakala fiche kwa"</string>
     <string name="add_attachment_menu" msgid="6854757034409168845">"Ambatisha faili"</string>
     <string name="close_action" msgid="533058985745238100">"Funga"</string>
-    <string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"Tuma ujumbe wote"</string>
+    <string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"Tuma barua zote"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Chagua kiambatisho"</string>
     <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Sogeza hadi"</string>
     <string name="status_loading_messages" msgid="6552307237621292344">"Inapakia ujumbe..."</string>
@@ -106,14 +106,14 @@
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Rasimu"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Kikasha toezi"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Mwonekano wa mchanganyiko"</string>
-    <string name="mailbox_list_account_selector_show_all_folders" msgid="4185052839366909439">"Onyesha makabrasha yote"</string>
+    <string name="mailbox_list_account_selector_show_all_folders" msgid="4185052839366909439">"Onyesha folda zote"</string>
     <string name="mailbox_list_account_selector_account_header" msgid="4261295503836387876">"Akaunti"</string>
-    <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Makabrasha <xliff:g id="EMAIL_ADDRESS">%s</xliff:g> ya hivi karibuni"</string>
-    <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Ongeza makabrasha"</string>
-    <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Makabrasha ya hivi karibuni"</string>
+    <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Folda <xliff:g id="EMAIL_ADDRESS">%s</xliff:g> za hivi karibuni"</string>
+    <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Folda zote"</string>
+    <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Folda za hivi karibuni"</string>
     <string name="message_subject_description" msgid="3597047441062021199">"Kichwa"</string>
     <string name="message_is_empty_description" msgid="4004644319382041459">"Hakuna kichwa"</string>
-    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Pakia ujumbe zaidi"</string>
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Pakia barua zaidi"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">" <xliff:g id="MESSAGE_COUNT">%d</xliff:g> zimechaguliwa"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> zimechaguliwa"</item>
@@ -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="5722467956990009520">"Maandishii 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 mpokezi mmoja"</string>
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Ni lazima uongeze 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>
@@ -178,17 +178,17 @@
     <string name="message_view_message_details_dialog_title" msgid="5306529501287351018">"Maelezo ya Ujumbe"</string>
     <string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Maelezo ya kiambatisho"</string>
     <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Inahitaji muunganisho wa Wi-Fi"</string>
-    <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Mipangilio ya Wi-Fi"</string>
+    <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Mipangilio ya mtandao-hewa"</string>
     <string name="attachment_info_application_settings" msgid="9128108769497191200">"Mipangilio ya programu"</string>
     <string name="attachment_info_unknown" msgid="8342655396805943320">"Haiwezi kufungua kiambatisho."</string>
-    <string name="attachment_info_malware" msgid="1478505616946912328">"Kwa sababu aina hii ya kiambatisho kinaweza kuwa na programu hatari, huwezi kuihifadhi au kuifungua."</string>
+    <string name="attachment_info_malware" msgid="1478505616946912328">"Kwa sababu aina hii ya kiambatisho inaweza kuwa na programu hatari, huwezi kuihifadhi au kuifungua."</string>
     <string name="attachment_info_policy" msgid="328224012587376154">"Kiambatisho hiki hakiwezi kuhifadhiwa au kufunguliwa kwa sababu ya sera za usalama zilizowekwa za akaunti hii."</string>
-    <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Kiambataisho hiki ni kirefu mno kuweza kupakua kuptia kwa mtandao wa simu. Unaweza vipakua wakati mwingine ukiunganisha kwa mtandao wa Wi-Fi"</string>
-    <string name="attachment_info_no_intent" msgid="5277484372596654977">"Hakuna programu ya kusanidi ambayo inaweza kufungua kiambatisho hiki. Jaribu kupakua programu inayofaa kutoka kwa Android Market"</string>
-    <string name="attachment_info_sideload_disabled" msgid="1884647432057183615">"Kiambatanisho hiki ni programu. Lazima uangalie vyanzo visivyojulikana katika mipangilio, kwenye programu, kabla ya kuisakini."</string>
-    <string name="attachment_info_apk_install_disabled" msgid="9077383681081393067">"Programu haiwezi kusakinishwa moja kwa moja kutoka kwa Barua pepe. Kwanza hifadhi programu hii na kisha isakinishe kwa kutumia programu ya Vipakuliwa."</string>
+    <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Kiambataisho hiki ni kirefu mno kuweza kupakua kupitia kwa mtandao wa simu. Unaweza kuipakua wakati mwingine ukiunganisha kwa mtandao-hewa."</string>
+    <string name="attachment_info_no_intent" msgid="5277484372596654977">"Hakuna programu iliyowekwa inayoweza kufungua kiambatisho hiki. Jaribu kupakua programu inayofaa kutoka kwa Android Market"</string>
+    <string name="attachment_info_sideload_disabled" msgid="1884647432057183615">"Kiambatanisho hiki ni programu. Lazima uangalie vyanzo visivyojulikana katika mipangilio, kwenye programu, kabla ya kuiweka."</string>
+    <string name="attachment_info_apk_install_disabled" msgid="9077383681081393067">"Programu haziwezi kusakinishwa moja kwa moja kutoka kwa Barua pepe. Kwanza hifadhi programu hii na kisha isakinishe kwa kutumia programu ya Vipakuliwa."</string>
     <string name="attachment_not_found" msgid="2593390852574725378">"Kiambatisho hakikuweza kupakuliwa."</string>
-    <string name="message_decode_error" msgid="7812862491622388416">"Hitilafu wakati wa ujumbe wa uondoaji msimbo."</string>
+    <string name="message_decode_error" msgid="7812862491622388416">"Hitilafu wakati wa kusimbua ujumbe."</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Kutazama <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="message_delete_dialog_title" msgid="7189172554183139772">"Tupa ujumbe"</string>
   <plurals name="message_delete_confirm">
@@ -240,13 +240,13 @@
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Unaweza kusanidi akaunti ya Exchange ActiveSync kwa 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 kwa chaguo-msingi"</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_manual_setup_action" msgid="8053852205391155912">"Usanidi wa mkono"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Tafadhali andika anwani na nenosiri halali la barua pepe."</string>
     <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Akaunti Rudufu"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Uingiaji huu unatumika tayari kwa akaunti ya \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"Nenosiri hili linaanza ama kumalizika na herufi moja ya nafasi. Seva nyingi hazikubali manenosiri yenye nafasi"</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Kurudisha maelezo ya akaunti"</string>
+    <string name="account_password_spaces_error" msgid="8928309156658903257">"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="4121970450267725664">"Inarudisha maelezo ya akaunti"</string>
     <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>
@@ -256,7 +256,7 @@
     <string name="account_setup_names_user_name_empty_error" msgid="1251952000604599298">"Sehemu hii haiwezi kuwa tupu"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Usanidi wa akaunti"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Aina ya akaunti"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hii ni aina gani ya akaunti?"</string>
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hii ni akaunti ya aina gani ?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Usanidi wa akaunti"</string>
     <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>
@@ -272,15 +272,15 @@
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Futa barua pepe kutoka kwa seva"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Katu"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Nikifuta kutoka kwa kisanduku pokezi"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Kijia cha prefiksi ya IMAP"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Nikifuta kutoka kwa kikasha"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Kiambishi cha njia ya IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Hiari"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Usanidi wa akaunti"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Mipangilio ya seva ya kutoka"</string>
     <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 kuingia"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Inahitaji uingie"</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>
@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Kikoa\\Jina la mtumiaji"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Tumia muunganisho salama (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Kubali vyeti vyote vya SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Cheti cha mtteja"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Chagua"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Tumia cheti cha mteja"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Ondoa"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Hakuna"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Kitambulisho cha Kifaa cha Mkononi"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Mipangilio ya akaunti"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Chaguo za akaunti"</string>
@@ -302,12 +305,12 @@
     <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 kwa chaguo-msingi"</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_background_attachments_label" msgid="5247749298276451846">"Pakua kiotomatiki viambatisho wakati umeunganishwa kwenye Wi-Fi"</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="7827583313117521383">"Haikumaliza kuweka"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Siku hadi Usawazishaji"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Kiotomatiki"</string>
@@ -322,7 +325,7 @@
     <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_certificate_message" msgid="961843413600482906">"Haiwezi kuunganisha kwa seva kwa usalama."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Haiwezi kuunganisha kwa seva kwa usalama."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Cheti cha mtumiaji kinahitajika ili kuunganisha kwa seva."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Cheti cha mteja kinahitajika. Unganisha kwa seva na cheti cha mteja?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Cheti ni batili au hakiwezi kufikiwa."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Seva iliitikia na hitilafu; tafadhali kagua jina lako la mtumiaji na nenosiri na ujaribu tena."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Haiwezi kuunganisha kwa seva."</string>
@@ -336,38 +339,38 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Udhibiti wa usalama kutoka mbali"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Seva <xliff:g id="SERVER">%s</xliff:g> inahitaji uiruhusu kudhibiti kwa umbali baadhi ya vipengele vya usalama vya simu yako. Ungependa kumaliza kuweka mipangilio ya akaunti hii?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="6647663405501663019">"Seva hii inahitaji vipengele vya usalama ambavyo kifaa chako cha Android hakisaidii, ikijumlisha: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="9057508235700936322">"Huwezi kubadilisha jina la mtumiaji la akaunti. Ili kuongeza akaunti na jina la mtumiaji tofauti, gusa Ongeza akaunti."</string>
+    <string name="account_setup_username_uneditable_error" msgid="9057508235700936322">"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="4940147098039352135">"ILANI: Kulemaza kibali cha programu ya Barua pepe ili kusimamia kifaa chako kutafuta 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="1340675800634074043">"Uboreshaji wa usalama unahitajika"</string>
-    <string name="account_security_dialog_content_fmt" msgid="7950790060554861792">"<xliff:g id="ACCOUNT">%s</xliff:g>inakuhitaji kusasisha mipangilio yako ya usalama."</string>
+    <string name="account_security_dialog_content_fmt" msgid="7950790060554861792">"<xliff:g id="ACCOUNT">%s</xliff:g> inakuhitaji usasishe mipangilio yako ya usalama."</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="account_security_title" msgid="4441470647344315196">"Usalama wa Kifaa"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Seva <xliff:g id="SERVER">%s</xliff:g>inahitaji uiruhusu katika kudhibiti kwa umbali baadhi ya vipengele vya usalama vya simu yako."</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>
-    <string name="password_expire_warning_ticker_fmt" msgid="7367710094579526056">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" Inahitaji kubadilisha nywila yako ya skrini au nenosiri."</string>
+    <string name="password_expire_warning_ticker_fmt" msgid="7367710094579526056">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" inakuhitaji ubadilishe PIN yako ya skrini au nenosiri."</string>
     <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Nenosiri la kufunga skrini linaisha muda"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"Nenosiri la kufungs skrini yako limechina."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"Nenosiri la kufunga skrini limechina"</string>
+    <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 nywila yako ya skrini au manenosiri, ama data ya <xliff:g id="ACCOUNT">%s</xliff:g> itafutwa. Ibadilishe saa hii?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"Nenosiri la kufunga skrini limechina"</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_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="account_settings_exit_server_settings" msgid="8006323251094711431">"Tupa mabadiliko yasiyohifadhiwa?"</string>
     <string name="account_settings_login_dialog_title" msgid="3348853165458574221">"imeshindwa kuingia"</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. Yaboreshe saa hii?"</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_default_label" msgid="3575963379680943640">"Akaunti chaguo-msingi"</string>
-    <string name="account_settings_default_summary" msgid="1531901438624688482">"Tuma ujumbe kutoka kwa akaunti hii kwa 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="6044567979405738536">"Pakua kioto viambatisho"</string>
-    <string name="account_settings_background_attachments_summary" msgid="8036004124395110306">"Pakua kiotomatiki viambatisho wakati umeunganishwa kwenye Wi-Fi"</string>
+    <string name="account_settings_background_attachments_summary" msgid="8036004124395110306">"Pakua viambatisho kiotomatiki wakati umeunganishwa kwenye mtandao-hewa"</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_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, na mipangilio mingine ya seva inayoingia"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Mipangilio ya nje"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Jina la mmtumiaji, neneosiri na mipangilio mingine ya nje ya seva."</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_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>
@@ -403,9 +406,9 @@
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="2957945231022052672">"Siku hadi Usawazishaji"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Akaunti ya barua pepe"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Chagua akaunti"</string>
-    <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Chagua kabrasha"</string>
+    <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Chagua folda"</string>
     <string name="toast_account_not_found" msgid="2483831308629565584">"Akaunti haipatikani. Huenda ikawa imeondolewa."</string>
-    <string name="toast_mailbox_not_found" msgid="4035254695648112767">"Kabrasha halipatikani. Huenda limeondolewa."</string>
+    <string name="toast_mailbox_not_found" msgid="4035254695648112767">"Folda haipatikani. Huenda imeondolewa."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Akaunti zingine za \"plus\" tu ndizo zinazojumuisha ufikiaji wa POP na kwa hivyo kuruhusu programu hii kuunganisha. Kama huwezi kuingia na anwani na nenosiri lako sahihi la barua pepe, huenda usiwe na akaunti iliyolipiwa ya \"Plus\". Tafadhali zindua kivinjari Wavuti ili uweze kufikia akaunti hizi za barua."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Kabla ya kuweka mipangilio ya akaunti hii ya barua pepe, tafadhali tembelea tovuti ya T-Online na uunde nenosiri la kufikia barua pepe kwa POP3."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Shirika"</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Kawaida"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Kubwa"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kubwa mno"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Jibu wote"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Fanya \'Jibu wote\' iwe chaguo mbadala ya kujibu ujumbe"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Rejesha chaguo-msingi la \"Onyesha picha\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Rejesha chaguo-msingi kwa watumaji wote (usionyeshe picha kiotomatiki)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Onyesha picha zilizoondolewa."</string>
@@ -466,5 +465,5 @@
     <string name="search_header_text_fmt" msgid="3857004638127418247">"Tafuta \"<xliff:g id="ID_1">%1$s</xliff:g>\" katika matokeo"</string>
     <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">"Makabrasha"</string>
+    <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Folda"</string>
 </resources>