diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9165f3ac1..70f4b5bf2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -241,7 +241,7 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-Mail-Adresse"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Passwort"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-Mails standardmäßig von diesem Konto senden"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuelle Einrichtung"</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuell einrichten"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Geben Sie eine gültige E-Mail-Adresse und ein gültiges Passwort ein."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dupliziertes Konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Sie verwenden diesen Nutzernamen bereits für das Konto \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d219369fa..4a3aa5188 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -390,7 +390,7 @@
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrering"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer også når nye e-postmeldinger mottas"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alltid"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kun ved stille modus"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kun i stillemodus"</string>
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldri"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrering"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Velg ringetone"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e43d35221..eec36d996 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -179,14 +179,14 @@
     <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 mtandao-hewa"</string>
-    <string name="attachment_info_application_settings" msgid="4124655487276125596">"Mipangilio ya prog"</string>
+    <string name="attachment_info_application_settings" msgid="4124655487276125596">"Mipangilio ya programu"</string>
     <string name="attachment_info_unknown" msgid="8342655396805943320">"Haiwezi kufungua kiambatisho."</string>
     <string name="attachment_info_malware" msgid="6576029010855055528">"Hauwezi kuhifadhi au kufungua faili hii kwa sababu ya aina hii ya kiambatisho kinaweza kuwa na programu hasidi."</string>
     <string name="attachment_info_policy" msgid="3560422300127587508">"KIambatisho hiki hakiwezi kuhifadhiwa au kufunguliwa kwa sababu ya sera za usalama za akaunti hii."</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="8139209405745777924">"Hakuna prog zilizosakinishwa ambazo zinaweza kufungua kiambatisho hiki. Jaribu kupakua programu ifaayo kutoka kwa Android Market."</string>
-    <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Kiambatisho hiki ni prog. Unapaswa kuangalia Vyanzo Visivyojulikana katika Mipangilio &amp;gt, Prog kabla uweze kuisanidi."</string>
-    <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Prog haziwezi kusakinishwa moja kwa moja kutoka kwa barua pepe. Kwanza hifadhi programu hii na kisha isakinishe kwa kutumia programu za Upakuzi."</string>
+    <string name="attachment_info_no_intent" msgid="8139209405745777924">"Hakuna programu zilizosakinishwa ambazo zinaweza kufungua kiambatisho hiki. Jaribu kupakua programuramu ifaayo kutoka kwa Android Market."</string>
+    <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Kiambatisho hiki ni programu. Unapaswa kuangalia Vyanzo Visivyojulikana katika Mipangilio &amp;gt, Prog kabla uweze kuisanidi."</string>
+    <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Prog haziwezi kusakinishwa moja kwa moja kutoka kwa barua pepe. Kwanza hifadhi programuramu hii na kisha isakinishe kwa kutumia programuramu za Upakuzi."</string>
     <string name="attachment_not_found" msgid="7155322700141145123">"Haikuweza kupakia kiambatisho hiki."</string>
     <string name="message_decode_error" msgid="5016042255170947834">"Kulikuwa na hitilafu wakati wa usimbuaji wa ujumbe."</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Kutazama <xliff:g id="FILENAME">%s</xliff:g>"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1eefb8f0e..b546cd1e7 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -30,7 +30,7 @@
     <string name="send_action" msgid="1729766205562446418">"Gửi"</string>
     <string name="reply_action" msgid="4262472229221507619">"Trả lời"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Trả lời tất cả"</string>
-    <string name="delete_action" msgid="8421026208288857155">"Xoá"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Xóa"</string>
     <string name="forward_action" msgid="669174181042344116">"Chuyển tiếp"</string>
     <string name="favorite_action" msgid="4664259801498253756">"Gắn dấu sao"</string>
     <string name="done_action" msgid="7497990549515580249">"Xong"</string>
@@ -43,7 +43,7 @@
     <string name="read_action" msgid="4701484794504781686">"Đánh dấu là đã đọc"</string>
     <string name="unread_action" msgid="6280399049357552826">"Đánh dấu là chưa đọc"</string>
     <string name="set_star_action" msgid="4660317166196258160">"Thêm dấu sao"</string>
-    <string name="remove_star_action" msgid="6689770999647007163">"Xoá dấu sao"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Xóa dấu sao"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Làm mới"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Thêm tài khoản"</string>
     <string name="compose_action" msgid="4045702519637388045">"Soạn"</string>
@@ -196,8 +196,8 @@
     <item quantity="other" msgid="4437637377522896262">"Xóa các thư này?"</item>
   </plurals>
   <plurals name="message_deleted_toast">
-    <item quantity="one" msgid="710742672464447084">"Tin nhắn đã bị xoá."</item>
-    <item quantity="other" msgid="6574961322865652255">"Tin nhắn đã bị xoá."</item>
+    <item quantity="one" msgid="710742672464447084">"Tin nhắn đã bị xóa."</item>
+    <item quantity="other" msgid="6574961322865652255">"Tin nhắn đã bị xóa."</item>
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Tin nhắn đã bị hủy."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Tin nhắn đã được lưu dưới dạng tin nháp."</string>
@@ -270,9 +270,9 @@
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (chấp nhận tất cả chứng chỉ)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Xoá email khỏi máy chủ"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Xóa email khỏi máy chủ"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Chưa bao giờ"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Khi tôi xoá khỏi Hộp thư đến"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Khi tôi xóa khỏi Hộp thư đến"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Tiền tố đường dẫn IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Tùy chọn"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Thiết lập tài khoản"</string>
@@ -307,8 +307,8 @@
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Hàng giờ"</string>
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"Gửi email từ tài khoản này theo mặc định."</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Thông báo cho tôi khi email đến."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Đồng bộ hoá danh bạ từ tài khoản này."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Đồng bộ hoá lịch từ tài khoản này."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Đồng bộ hóa danh bạ từ tài khoản này."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Đồng bộ hóa lịch từ tài khoản này."</string>
     <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Đồng bộ hóa email từ tài khoản này."</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Tự động tải xuống tệp đính kèm khi được kết nối Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Không thể kết thúc"</string>
@@ -381,7 +381,7 @@
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Sử dụng dữ liệu"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Chỉnh sửa trả lời nhanh"</string>
     <string name="save_action" msgid="1988862706623227093">"Lưu"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Đồng bộ hoá danh bạ"</string>
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Đồng bộ hóa danh bạ"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Đồng bộ hóa danh bạ cho tài khoản này"</string>
     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Đồng bộ hóa lịch"</string>
     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Đồng bộ hóa lịch cho tài khoản này"</string>
@@ -395,8 +395,8 @@
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Rung"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Chọn nhạc chuông"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Cài đặt máy chủ"</string>
-    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Xoá tài khoản"</string>
-    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Tài khoản \"<xliff:g id="ACCOUNT">%s</xliff:g>\" sẽ bị xoá khỏi Email."</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Xóa tài khoản"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Tài khoản \"<xliff:g id="ACCOUNT">%s</xliff:g>\" sẽ bị xóa khỏi Email."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Xóa tài khoản"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Xóa tài khoản"</string>
     <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Tùy chọn đồng bộ hóa"</string>