diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 945184146..8519094a9 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -93,7 +93,7 @@
     <string name="authentication_label" msgid="5210804218348191833">"ማረጋገጥ"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"ማረጋገጫ አክል"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"ማረጋገጫን አጽዳ"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"እራስዎ ማዋቀር"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"በእጅ ማዋቀር"</u></string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"እባክህ ትክክለኛ ኢሜይል አድራሻ እና ይለፍ ቃል ፃፍ።"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"ተመሳሳይ መለያ"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"ለመለያ \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ይህን ተጠቃሚ ስም ቀደም ሲል እየተጠቀምክበት ነው::"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 909be1f81..da4804284 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -93,7 +93,7 @@
     <string name="authentication_label" msgid="5210804218348191833">"Έλεγχος ταυτότητας"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Προσθήκη ελέγχου ταυτότητας"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Διαγραφή ελέγχου ταυτότητας"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Μη αυτόματα ρύθμιση"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Μη αυτόματη ρύθμιση"</u></string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Πληκτρολογήστε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου και έναν έγκυρο κωδικό πρόσβασης."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Διπλότυπος λογαριασμός"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Χρησιμοποιείτε ήδη αυτό το όνομα χρήστη για τον λογαριασμό \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 695c1ddee..93e22f7c9 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -169,7 +169,7 @@
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alles"</string>
     <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Accountstandaard gebruiken"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Gebruikersnaam of wachtwoord is onjuist."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Aanmelden mislukt.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Inloggen mislukt.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Probleem met instellen van account"</string>
     <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"Controleer of de gebruikersnaam, het wachtwoord en de accountinstellingen correct zijn."</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Kan geen veilige verbinding met de server tot stand brengen."</string>
@@ -212,7 +212,7 @@
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Niet-opgeslagen wijzigingen annuleren?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Kan niet inloggen"</string>
     <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"De gebruikersnaam of het wachtwoord voor <xliff:g id="ACCOUNT">%s</xliff:g> is onjuist. Wilt u deze nu bijwerken?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Uw aanmelding bij <xliff:g id="ACCOUNT">%s</xliff:g> is mislukt. De server retourneerde het volgende bericht: <xliff:g id="REASON">%s</xliff:g> Wilt u uw gebruikersnaam en/of wachtwoord bijwerken?"</string>
+    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Inloggen bij <xliff:g id="ACCOUNT">%s</xliff:g> is mislukt. De server retourneerde het volgende bericht: <xliff:g id="REASON">%s</xliff:g> Wilt u uw gebruikersnaam en/of wachtwoord bijwerken?"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Bijlagen downloaden"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Bijlagen van recente berichten automatisch downloaden via wifi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Meldingen via e-mail"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d4f873315..083ad6717 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -93,7 +93,7 @@
     <string name="authentication_label" msgid="5210804218348191833">"Uthibitishaji"</string>
     <string name="add_authentication_label" msgid="865206092644419804">"Ongeza uthibitishaji"</string>
     <string name="clear_authentication_label" msgid="8113966442068335059">"Futa uthibitishaji"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Usanidi wa mtu mwenyewe"</u></string>
+    <string name="account_setup_basics_manual_setup_action" msgid="6640115171889882878"><u>"Usanidi wa kujifanyia"</u></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>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Tayari unatumia jina hili la mtumiaji kwa akaunti \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>