diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f68e6bf..967f84a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -17,6 +17,7 @@
   <string name="intro_5_2">Der Einrichtungsassistent wird ein paar Minuten brauchen, dann ist alles bereit.</string>
   <string name="lets_get_started">Fangen wir an</string>
   <string name="title_activity_setup">Einrichtung</string>
+  <string name="please_finish_setup">Bitte schließen Sie die Einrichtung von Bote ab.</string>
   <string name="skip">überspringen</string>
   <string name="set_password">Passwort festlegen</string>
   <string name="setup_set_password_1">Sie können ein Passwort für Bote einstellen. Dies wird andere Nutzer davon abhalten, Ihre E-Mails zu lesen, und wird alle Dateien auf der Festplatte verschlüsseln.</string>
@@ -40,7 +41,9 @@
   <string name="pull_text">Zum Abrufen der E-Mails: ziehen</string>
   <string name="refreshing_text">Prüfe auf neue E-mails</string>
   <string name="release_text">Loslassen, um auf neue E-mails zu prüfen</string>
+  <!--Argument is a number-->
   <string name="incomplete_emails">%s unvollständige E-Mails</string>
+  <!--Argument is a number-->
   <string name="items_selected">%s ausgewählt</string>
   <string name="action_delete">löschen</string>
   <string name="action_mark_read">als gelesen markieren</string>
@@ -75,7 +78,11 @@
   </plurals>
   <string name="queued">in Warteschlange</string>
   <string name="sending">versenden ...</string>
+  <!--Argument 1: how many recipients the email has been sent to so far.
+     Argument 2: the total number of recipients the email will be sent to.-->
   <string name="sent_to_short">%1$d von %2$d versendet</string>
+  <!--Argument 1: how many recipients the email has been sent to so far.
+     Argument 2: the total number of recipients the email will be sent to.-->
   <string name="sent_to">An %1$d von %2$d Empfänger versendet</string>
   <string name="email_sent">E-Mail versendet</string>
   <string name="gateway_disabled">Gateway deaktiviert</string>
@@ -97,6 +104,7 @@
   <string name="add_one_recipient">Mindestens ein Empfänger nötig</string>
   <string name="email_queued_for_sending">Email in der Sendewarteschlange eingefügt </string>
   <string name="response_prefix_re">Antw:</string>
+  <!--Used in email replies above quoted text, like "Bob wrote:"-->
   <string name="response_quote_wrote">%s schrieb:</string>
   <string name="address_book_empty">Adressbuch ist leer</string>
   <string name="share">Teilen</string>
@@ -152,6 +160,7 @@
   <string name="old_password">Altes Passwort</string>
   <string name="new_password">Neues Passwort</string>
   <string name="confirm_new_password">Neues Passwort bestätigen</string>
+  <string name="remove_password_info">Um das Passwort zu entfernen, lassen Sie das \'Neues Passwort\'-Feld leer.</string>
   <string name="password_changed">Passwort erfolgreich geändert</string>
   <string name="pref_title_identities">Identitäten</string>
   <string name="new_identity">Neue Identität …</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3eef461..42b6ac5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -17,6 +17,7 @@
   <string name="intro_5_2">El asistente de instalación tardará un par de minutos, y luego todo estará listo.</string>
   <string name="lets_get_started">Comencemos</string>
   <string name="title_activity_setup">Instalar</string>
+  <string name="please_finish_setup">Por favor termine de configurar Bote.</string>
   <string name="skip">Omitir</string>
   <string name="set_password">Establecer contraseña</string>
   <string name="setup_set_password_1">Puede establecer una contraseña para Bote. Esto prevendrá que otros usuarios lean sus correos, y cifrará todos los ficheros en-el-disco.</string>
@@ -40,7 +41,9 @@
   <string name="pull_text">Descargar para comprobar el correo</string>
   <string name="refreshing_text">Comprobando el correo...</string>
   <string name="release_text">Dejar ir para comprobar el correo</string>
+  <!--Argument is a number-->
   <string name="incomplete_emails">%s correos incompletos</string>
+  <!--Argument is a number-->
   <string name="items_selected">%s seleccionados</string>
   <string name="action_delete">Eliminar</string>
   <string name="action_mark_read">Marcar como leído</string>
@@ -75,7 +78,11 @@
   </plurals>
   <string name="queued">En cola</string>
   <string name="sending">Enviando</string>
+  <!--Argument 1: how many recipients the email has been sent to so far.
+     Argument 2: the total number of recipients the email will be sent to.-->
   <string name="sent_to_short">Enviado %1$d de %2$d</string>
+  <!--Argument 1: how many recipients the email has been sent to so far.
+     Argument 2: the total number of recipients the email will be sent to.-->
   <string name="sent_to">Enviado a %1$d de %2$d destinatarios</string>
   <string name="email_sent">Correo enviado</string>
   <string name="gateway_disabled">Pasarela deshabilitada</string>
@@ -97,6 +104,7 @@
   <string name="add_one_recipient">Añadir al menos un destinatario.</string>
   <string name="email_queued_for_sending">Correo en cola para su envío</string>
   <string name="response_prefix_re">Re:</string>
+  <!--Used in email replies above quoted text, like "Bob wrote:"-->
   <string name="response_quote_wrote">%s escribió:</string>
   <string name="address_book_empty">La libreta de direcciones está vacía</string>
   <string name="share">Compartir</string>
@@ -152,6 +160,7 @@
   <string name="old_password">Contraseña antigua</string>
   <string name="new_password">Nueva contraseña</string>
   <string name="confirm_new_password">Confirmar nueva contraseña</string>
+  <string name="remove_password_info">Para eliminar la contraseña, deje en blanco los campos \'Nueva contraseña\'.</string>
   <string name="password_changed">Contraseña cambiada con éxito</string>
   <string name="pref_title_identities">Identidades</string>
   <string name="new_identity">Nueva identidad...</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0aad606..2f53177 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -17,6 +17,7 @@
   <string name="intro_5_2">L\'assistant de configuration prendra deux ou trois minutes puis ensuite tout sera prêt.</string>
   <string name="lets_get_started">Commençons</string>
   <string name="title_activity_setup">Configuration</string>
+  <string name="please_finish_setup">Veuillez terminer de configurer Bote.</string>
   <string name="skip">Sauter</string>
   <string name="set_password">Définir mot de passe</string>
   <string name="setup_set_password_1">Vous pouvez mettre un mot de passe à Bote. Ceci empêchera d\'autres utilisateurs de lire vos courriers électroniques et cryptera sur le disque tous les fichiers.</string>
@@ -40,7 +41,9 @@
   <string name="pull_text">Tirer pour chercher du courrier électronique</string>
   <string name="refreshing_text">Recherche de courrier...</string>
   <string name="release_text">Allons chercher du courrier</string>
+  <!--Argument is a number-->
   <string name="incomplete_emails">%s courriers incomplets</string>
+  <!--Argument is a number-->
   <string name="items_selected">%s sélectionné(s)</string>
   <string name="action_delete">Supprimer</string>
   <string name="action_mark_read">Marquer lu</string>
@@ -75,7 +78,11 @@
   </plurals>
   <string name="queued">Mis en file d\'attente</string>
   <string name="sending">Envoi</string>
+  <!--Argument 1: how many recipients the email has been sent to so far.
+     Argument 2: the total number of recipients the email will be sent to.-->
   <string name="sent_to_short">Envoyés %1$d sur %2$d</string>
+  <!--Argument 1: how many recipients the email has been sent to so far.
+     Argument 2: the total number of recipients the email will be sent to.-->
   <string name="sent_to">Envoyé à %1$d parmi %2$d destinataires</string>
   <string name="email_sent">Email envoyé</string>
   <string name="gateway_disabled">Passerelle désactivée</string>
@@ -97,6 +104,7 @@
   <string name="add_one_recipient">Ajouter un destinataire au minimum</string>
   <string name="email_queued_for_sending">Email mis en file d\'attente pour envoi</string>
   <string name="response_prefix_re">Re :</string>
+  <!--Used in email replies above quoted text, like "Bob wrote:"-->
   <string name="response_quote_wrote">%s a écrit :</string>
   <string name="address_book_empty">Le carnet d\'adresses est vide</string>
   <string name="share">Partager</string>
@@ -152,6 +160,7 @@
   <string name="old_password">Ancien mot de passe</string>
   <string name="new_password">Nouveau mot de passe</string>
   <string name="confirm_new_password">Confirmer le mot de passe</string>
+  <string name="remove_password_info">Pour retirer le mot de passe, laissez vide le champ \'Nouveau mot de passe\'.</string>
   <string name="password_changed">Mot de passe modifié avec succès</string>
   <string name="pref_title_identities">Identités</string>
   <string name="new_identity">Nouvelle identité ...</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7ddb76c..58ecfbd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -17,6 +17,7 @@
   <string name="intro_5_2">Мастеру установки потребуется несколько минут, затем всё будет готово к работе.</string>
   <string name="lets_get_started">Давайте начнем</string>
   <string name="title_activity_setup">Установка</string>
+  <string name="please_finish_setup">Пожалуйста, завершите установку Bote.</string>
   <string name="skip">Пропустить</string>
   <string name="set_password">Установка пароля</string>
   <string name="setup_set_password_1">Вы можете установить пароль для Bote. Это не позволит другим пользователям читать ваши сообщения, а также зашифрует все файлы на диске.</string>
@@ -39,7 +40,9 @@
   <string name="start_i2p_android">Похоже, что I2P Android не запущен. Запустить I2P Android?</string>
   <string name="pull_text">Потяните, чтобы проверить почту</string>
   <string name="refreshing_text">Выполняется проверка электронной почты…</string>
+  <!--Argument is a number-->
   <string name="incomplete_emails">%s незаконченных писем</string>
+  <!--Argument is a number-->
   <string name="items_selected">%s выбрано</string>
   <string name="action_delete">Удалить</string>
   <string name="action_mark_read">Пометить как прочитанное</string>
@@ -68,9 +71,18 @@
   <string name="waiting_for_network">Ожидание I2P</string>
   <string name="connecting_to_network">Подключение к сети Bote</string>
   <string name="connected_to_network">Подключение к сети Bote выполнено</string>
+  <plurals name="n_new_emails">
+    <item quantity="one">Одно новое письмо</item>
+    <item quantity="few">%d новых письма</item>
+    <item quantity="other">%d новых писем</item>
+  </plurals>
   <string name="queued">В очереди</string>
   <string name="sending">Отправка</string>
+  <!--Argument 1: how many recipients the email has been sent to so far.
+     Argument 2: the total number of recipients the email will be sent to.-->
   <string name="sent_to_short">Отправлено %1$d из %2$d</string>
+  <!--Argument 1: how many recipients the email has been sent to so far.
+     Argument 2: the total number of recipients the email will be sent to.-->
   <string name="sent_to">Отправлено %1$d из %2$d получателей</string>
   <string name="email_sent">Сообщение отправлено</string>
   <string name="gateway_disabled">Шлюз отключен</string>
@@ -91,6 +103,7 @@
   <string name="add_one_recipient">Добавьте как минимум одного получателя</string>
   <string name="email_queued_for_sending">Письмо поставлено в очередь на отправку</string>
   <string name="response_prefix_re">Re:</string>
+  <!--Used in email replies above quoted text, like "Bob wrote:"-->
   <string name="response_quote_wrote">%s пишет:</string>
   <string name="address_book_empty">Адресная книга пуста</string>
   <string name="share">Поделиться</string>
@@ -146,6 +159,7 @@
   <string name="old_password">Старый пароль</string>
   <string name="new_password">Новый пароль</string>
   <string name="confirm_new_password">Подтвердите новый пароль</string>
+  <string name="remove_password_info">Чтобы убрать пароль, оставьте поля \'Новый пароль\' пустыми.</string>
   <string name="password_changed">Пароль успешно изменен</string>
   <string name="pref_title_identities">Идентификаторы</string>
   <string name="new_identity">Новый идентификатор...</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 38182cf..077069c 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -5,7 +5,7 @@
   <string name="intro_secure">I/e siguruar</string>
   <string name="swipe_to_start">Lëmoje për ta startuar</string>
   <string name="i_know_what_to_do">E di se çka do të bëj</string>
-  <string name="intro_1_1">E-posti tradicional është jo i sigurtë. Nuk është krijuar të mbrojë njerëzit nga përgjime ndërmjet rrjetit,</string>
+  <string name="intro_1_1">E-posti tradicional nuk është i sigurtë. Nuk është krijuar të mbrojë njerëzit nga përgjime ndërmjet rrjetit,</string>
   <string name="intro_1_2">Edhe nëse ju e inkriptoni përmbajtjen e e-posteve tuaja, përmbledhja e përgjithshme e të gjitha e-.posteve që shkëmbehen mund të përgjohet, pra sovraniteti i jetës private rrezikohet. </string>
   <string name="intro_2_1">Bote ështe një e-post i tipit të ri, që mund të ju shërbejë me siguri totale të përmbajtes së e-postëve tuaj që keni shkëmbyer në rrjetet sociale. Mund të punojë në I2P anonymity network (rrjet anonimiteti), që fsheh aktivitetet e juaja në rrjetet sociale. </string>
   <string name="intro_2_2">Kur e dërgoni një e-post ndërmjet Bote, ç\'do pjesë është e inkriptuar - duke e inkluduar edhe email metadata. Vetëm marrësi është në gjendje të shkarkojë dhe lexojë e-postin.</string>
@@ -17,6 +17,7 @@
   <string name="intro_5_2">Asistenti i konfigurimit merr pak kohë, dhe pastaj e tëra është gati.</string>
   <string name="lets_get_started">Le të fillojmë</string>
   <string name="title_activity_setup">Konfigurimi</string>
+  <string name="please_finish_setup">Ju lutem përfundoni të vendosni Bote\'në. </string>
   <string name="skip">Anashkalo/kapërce</string>
   <string name="set_password">Fute fjalëkalimin</string>
   <string name="setup_set_password_1">Mund të krijosh një fjalëkalim për Bote. Kjo do të pamundësonte potencialin e përgjimit të e-postëve tuaj nga përdorësit tjerë, dhe do te inkriptonte të gjitha filet on-disk (në disk).</string>
@@ -40,7 +41,9 @@
   <string name="pull_text">Tërhiq për të shqyrtuar e-postet</string>
   <string name="refreshing_text">Duke shqyrtuar e-postet...</string>
   <string name="release_text">Lëshoje për të shqyrtuar e-poste</string>
+  <!--Argument is a number-->
   <string name="incomplete_emails">%s e-poste të pakryera</string>
+  <!--Argument is a number-->
   <string name="items_selected">%s selektuar</string>
   <string name="action_delete">Fshij</string>
   <string name="action_mark_read">Shenjo si të lexuar</string>
@@ -75,7 +78,11 @@
   </plurals>
   <string name="queued">Në radhë</string>
   <string name="sending">Duke dërguar</string>
+  <!--Argument 1: how many recipients the email has been sent to so far.
+     Argument 2: the total number of recipients the email will be sent to.-->
   <string name="sent_to_short">Dërgoj %1$d nga %2$d</string>
+  <!--Argument 1: how many recipients the email has been sent to so far.
+     Argument 2: the total number of recipients the email will be sent to.-->
   <string name="sent_to">Dërguar te %1$d nga %2$d marrës</string>
   <string name="email_sent">E-posti u dërgua</string>
   <string name="gateway_disabled">Porta jo në përdorim</string>
@@ -97,6 +104,7 @@
   <string name="add_one_recipient">Prano të paktën një marrës. </string>
   <string name="email_queued_for_sending">E-posti i radhitur për dërgim</string>
   <string name="response_prefix_re">Re:</string>
+  <!--Used in email replies above quoted text, like "Bob wrote:"-->
   <string name="response_quote_wrote">%s shkroi:</string>
   <string name="address_book_empty">Libri i adresave është i thatë</string>
   <string name="share">Shpërndaj</string>