diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a237ceb..4675fd3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -165,8 +165,6 @@
   <string name="also_check_i2p_android">Wenn das nicht hilft, überprüfen sie, ob I2P läuft. Sie können den gegenwärtigen Status von I2P im notification drawer sehen oder indem Sie die I2P App öffen. Falls es nicht richtig läuft, starten Sie I2P neu (in der App \"Stop\" klicken und dann \"Start\" wenn es erscheint). Warten Sie, bis I2P vollständig läuft, dann starten Sie Bote.</string>
   <string name="bote_connection_error">Bote-Verbindungsfehler</string>
   <string name="full_error_copied_to_clipboard">Vollständiger Fehler in die Zwischenablage kopiert</string>
-  <string name="pref_title_general">Allgemein</string>
-  <string name="pref_summ_general">Allgemeine Einstellungen und Standard-Identitätseinstellungen</string>
   <string name="pref_title_autoMail">Automatisch auf neue E-Mails prüfen</string>
   <string name="pref_title_checkInterval">Abrufintervall</string>
   <string name="pref_summ_checkInterval">%s Minuten</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bbf6fbf..7c190f2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -165,8 +165,6 @@
   <string name="also_check_i2p_android">Si eso no ayuda, compruebe que I2P está ejecutándose. Puede ver el estado actual de I2P en la bandeja de notificación, o al abrir la aplicación I2P. Si no está ejecutándose adecuadamente, reinicie I2P (en la aplicación, haga clic en \"Detener\", y luego, cuando aparezca, clic en \"Iniciar\"). Espere a que I2P esté ejecutándose completamente, y luego inicie Bote.</string>
   <string name="bote_connection_error">Error de conexión de Bote</string>
   <string name="full_error_copied_to_clipboard">Error completo copiado al portapapeles</string>
-  <string name="pref_title_general">General</string>
-  <string name="pref_summ_general">Preferencias generales y configuraciones de identidad por defecto</string>
   <string name="pref_title_autoMail">Auto-comprobar correo</string>
   <string name="pref_title_checkInterval">Intervalo de comprobación</string>
   <string name="pref_summ_checkInterval">%s minutos</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 068d51a..216dab7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -165,8 +165,6 @@
   <string name="also_check_i2p_android">Si cela ne vous aide pas, assurez-vous que I2P est en marche. Vous pouvez voir le statut actuel d\'I2P dans le tiroir de notification, ou en ouvrant l\'app I2P. Si cela ne marche pas correctement, redémarrez I2P (dans l\'app, cliquez \"Arrêter\", puis cliquez \"Démarrer\" quand il apparaît). Attendez que I2P soit complètement en marche, puis démarrez Bote.</string>
   <string name="bote_connection_error">Erreur de connexion Bote</string>
   <string name="full_error_copied_to_clipboard">L\'erreur entière a été copiée dans le presse-papiers</string>
-  <string name="pref_title_general">Général</string>
-  <string name="pref_summ_general">Paramètres généraux et paramètres d\'identité prédéfinie</string>
   <string name="pref_title_autoMail">Auto-chercher le courrier</string>
   <string name="pref_title_checkInterval">Intervalle de recherche</string>
   <string name="pref_summ_checkInterval">%s minutes</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index e437041..470525f 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -20,7 +20,6 @@
   <string name="please_finish_setup">Silahkan menyelesaikan pengaturan Bote.</string>
   <string name="skip">Lewati</string>
   <string name="set_password">Setel kata sandi</string>
-  <string name="setup_set_password_1">Anda dapat menyetel kata sandi untuk Bote. Hal ini akan mencegah pengguna lain membaca email Anda, dan akan mengenkripsi semua file pada disk.</string>
   <string name="setup_set_password_2">Jika Anda menyetela kata sandi, pemeriksaan email otomatis akan dinonaktifkan. Anda dapat memeriksan email secara manual ketika Anda telah mengontentikasikan dengan menarik kebawah pada Kotak masuk.</string>
   <string name="setup_set_password_3">Jika Anda tidak ingin menyetel kata sandi sekarang, Anda dapat melakukannya nanti dari menu Pengaturan.</string>
   <string name="create_identity">Membuat identitas</string>
@@ -96,6 +95,7 @@
   <string name="compose">Buat baru</string>
   <string name="subject">Subyek</string>
   <string name="compose_email">Membuat email</string>
+  <!--Argument is a file size, e.g. "500 KB"-->
   <string name="add_one_recipient">Tambahkan minimal satu penerima.</string>
   <string name="email_queued_for_sending">Email diantrikan untuk dikirm</string>
   <string name="subject_prefix_fwd">Fwd:</string>
@@ -124,8 +124,6 @@
   <string name="not_set">Belum disetel</string>
   <string name="relay_peers">Relay Peers:</string>
   <string name="banned_peers">Banned Peers:</string>
-  <string name="pref_title_general">Umum</string>
-  <string name="pref_summ_general">Pengaturan umum dan pengaturan identitas default</string>
   <string name="pref_title_autoMail">Oto-memeriksa surat</string>
   <string name="pref_title_checkInterval">Interval pemeriksaan</string>
   <string name="pref_summ_checkInterval">%s menit</string>
@@ -175,4 +173,6 @@
   <string name="no_identities_found">Tidak ada identitas yang ditemukan.</string>
   <string name="no_identities_found_maybe_encrypted">Tidak ada identitas yang ditemukan. Apakah file ini dienkripsi?</string>
   <string name="identities_imported">Identitas diimpor</string>
+  <!--As in software license, e.g. Apache License v2-->
+  <!--Software libraries-->
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c5a4f25..96461cd 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -165,8 +165,6 @@
   <string name="also_check_i2p_android">Als dat niet helpt, controleer dan of I2P draait. Je kan de huidige status van I2P zien in de meldingslade, of door de I2P-app te openen. Als het niet correct draait, herstart dan I2P (klik op \"Stop\" en vervolgens op \"Start\" in de app). Wacht tot I2P volledig draait, en start dan Bote.</string>
   <string name="bote_connection_error">Bote verbindingsfout</string>
   <string name="full_error_copied_to_clipboard">Volledige fout gekopieerd naar klembord</string>
-  <string name="pref_title_general">Algemeen</string>
-  <string name="pref_summ_general">Algemene instellingen en standaard identiteitsinstellingen</string>
   <string name="pref_title_autoMail">Automatisch controleren op mail</string>
   <string name="pref_title_checkInterval">Controle-interval</string>
   <string name="pref_summ_checkInterval">%s minuten</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b46b367..7f14b69 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -118,6 +118,7 @@
   <string name="compose">Utwórz</string>
   <string name="subject">Temat</string>
   <string name="compose_email">Napisz email</string>
+  <!--Argument is a file size, e.g. "500 KB"-->
   <string name="add_one_recipient">Dodaj przynajmniej jednego odbiorcę.</string>
   <string name="stop_composing_email">Zatrzymać tworzenie emaila?</string>
   <string name="all_changes_will_be_discarded">Wszystkie zmiany zostaną odrzucone.</string>
@@ -165,8 +166,6 @@
   <string name="also_check_i2p_android">Jeśli to nie pomoże, sprawdź czy I2P jest włączone. Możesz sprawdzić status I2P w szufladzie notyfikacji, lub poprzez otwarcie aplikacji I2P. Jeśli nie działa ono poprawnie, to zrestartuj I2P (w aplikacji kliknij \"Stop\", a następnie kliknij \"Start\" kiedy się pojawi). Poczekaj aż I2P będzie w pełni uruchomione i wtedy uruchom Bote.</string>
   <string name="bote_connection_error">Błąd połączenia Bote</string>
   <string name="full_error_copied_to_clipboard">Cały błąd został skopiowany do schowka</string>
-  <string name="pref_title_general">Generalne</string>
-  <string name="pref_summ_general">Ustawienia generalne i ustawienia domyślne tożsamości</string>
   <string name="pref_title_autoMail">Auto-Sprawdź czy są nowe e-maile</string>
   <string name="pref_title_checkInterval">Czas sprawdzania</string>
   <string name="pref_summ_checkInterval">%s minut</string>
@@ -227,4 +226,6 @@
   <string name="this_field_is_required">Te pole jest wymagane</string>
   <string name="bote_dest_for">Adres Bote dla %s</string>
   <string name="copied_to_clipboard">Skopiowano do schowka</string>
+  <!--As in software license, e.g. Apache License v2-->
+  <!--Software libraries-->
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a99c9a2..6326941 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -165,8 +165,6 @@
   <string name="also_check_i2p_android">Se isto não resolver o problema, verifique se o I2P está a correr. Pode ver o estado atual do I2P no painel de notificações, ou abrindo a app do I2P. Se não estiver a correr corretamente reinicie o I2P (dentro da app clique em \"Parar\" e depois em \"Iniciar\" quando este aparecer). Espere até ao I2P estar totalmente ligado e depois inicie o Bote.</string>
   <string name="bote_connection_error">Erro de ligação no Bote</string>
   <string name="full_error_copied_to_clipboard">O erro completo foi copiado para a área de transferência</string>
-  <string name="pref_title_general">Geral</string>
-  <string name="pref_summ_general">Configurações gerais e configurações da identidade usada por omissão</string>
   <string name="pref_title_autoMail">Verificar email automaticamente</string>
   <string name="pref_title_checkInterval">Intervalo de verificação</string>
   <string name="pref_summ_checkInterval">%s minutos</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 9097341..9a6cf30 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -73,6 +73,7 @@
   <string name="compose">Compune</string>
   <string name="subject">Subiect</string>
   <string name="compose_email">Compune email</string>
+  <!--Argument is a file size, e.g. "500 KB"-->
   <string name="add_one_recipient">Adăugați cel puțin un destinatar.</string>
   <string name="all_changes_will_be_discarded">Toate modificările vor fi eliminate.</string>
   <!--Used in email replies above quoted text, like "Bob wrote:"-->
@@ -93,7 +94,6 @@
   <string name="not_set">Ne configurat</string>
   <string name="relay_peers">Parteneri releu:</string>
   <string name="banned_peers">Parteneri interziși:</string>
-  <string name="pref_title_general">General</string>
   <string name="pref_summ_checkInterval">%s minute</string>
   <string name="pref_summ_minDelay">%s minute</string>
   <string name="pref_summ_maxDelay">%s minute</string>
@@ -130,4 +130,6 @@
   <string name="no_identities_found_maybe_encrypted">Nu s-au găsit identități. Fișierul este criptat?</string>
   <string name="identities_imported">Identități importate</string>
   <string name="this_field_is_required">Acest câmp este necesar</string>
+  <!--As in software license, e.g. Apache License v2-->
+  <!--Software libraries-->
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8e0ce9f..8a6a280 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -49,6 +49,7 @@
   <plurals name="incomplete_emails">
     <item quantity="one">Одно незаконченное письмо</item>
     <item quantity="few">%d незаконченных письма</item>
+    <item quantity="many">%d незаконченных писем</item>
     <item quantity="other">%d незаконченных писем</item>
   </plurals>
   <!--Argument is a number-->
@@ -82,6 +83,7 @@
   <plurals name="n_new_emails">
     <item quantity="one">Одно новое письмо</item>
     <item quantity="few">%d новых письма</item>
+    <item quantity="many">%d новых писем</item>
     <item quantity="other">%d новых писем</item>
   </plurals>
   <string name="queued">В очереди</string>
@@ -168,8 +170,6 @@
 Если есть проблемы, то перезапустите I2P (в приложении нажмите \"Остановить\", а затем нажмите, когда появится, \"Запустить\"). Подождите, пока I2P полностью запустится, и затем запустите Bote.</string>
   <string name="bote_connection_error">Ошибка соединения </string>
   <string name="full_error_copied_to_clipboard">Полный текст ошибки скопирован в буфер</string>
-  <string name="pref_title_general">Общие</string>
-  <string name="pref_summ_general">Общие настройки и настройки идентификатора по умолчанию</string>
   <string name="pref_title_autoMail">Автоматическая проверка почты</string>
   <string name="pref_title_checkInterval">Интервал проверки</string>
   <string name="pref_summ_checkInterval">%s мин.</string>
@@ -186,6 +186,7 @@
   <plurals name="pref_summ_numHops">
     <item quantity="one">%s ретранслятор</item>
     <item quantity="few">%s ретранслятора</item>
+    <item quantity="many">%s ретрансляторов</item>
     <item quantity="other">%s ретрансляторов</item>
   </plurals>
   <string name="pref_title_minDelay">Минимальная задержка при каждом прыжке</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 8bcbb61..c333035 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -20,7 +20,6 @@
   <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>
   <string name="setup_set_password_2">Nëse e krijoni fjalëkalimin, kontrollimi automatik i e-posteve do të ndalet. Mundeni manualisht të shikoni e-postet pasi që të jeni autentikuar duke e tërhequr poshtë Inbox\'in. </string>
   <string name="setup_set_password_3">Nëse nuk krijoni fjalëkalim menjëherë, mund ta bëni më vonë nga Cilësimet, </string>
   <string name="create_identity">Krijo identitet </string>
@@ -97,6 +96,7 @@
   <string name="compose">Krijo</string>
   <string name="subject">Tema</string>
   <string name="compose_email">Krijo e-postin</string>
+  <!--Argument is a file size, e.g. "500 KB"-->
   <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="subject_prefix_fwd">Fwd:</string>
@@ -125,8 +125,6 @@
   <string name="not_set">E pakryer. </string>
   <string name="relay_peers">Peersët ritransmetues:</string>
   <string name="banned_peers">Peers\'ët e dëbuar:</string>
-  <string name="pref_title_general">Të përgjithshme</string>
-  <string name="pref_summ_general">Cilësimet e përgjithshme dhe cilësimet e identitetit rëndom. </string>
   <string name="pref_title_autoMail">Auto-shiko postën</string>
   <string name="pref_title_checkInterval">Vëzhgoj intervalet</string>
   <string name="pref_summ_checkInterval">%s minuta</string>
@@ -175,4 +173,6 @@
   <string name="no_identities_found">Asnjë identitet nuk u gjet.</string>
   <string name="no_identities_found_maybe_encrypted">Asnjë identitet nuk u gjet. A është fili i inkriptuar?</string>
   <string name="identities_imported">Identitete u importuan</string>
+  <!--As in software license, e.g. Apache License v2-->
+  <!--Software libraries-->
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 9a43fdd..1dfc6eb 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -163,8 +163,6 @@
   <string name="also_check_i2p_android">如果这没有效果，请检查 I2P 是否正在运行。您可以在通知抽屉中看到 I2P 的连接状态，或者打开 I2P 应用查看也可以。如果它并未正常运行，重启 I2P（在应用中点击“停止”，然后等待并点击“开始”）。等待 I2P 完全运行，然后启动 Bote。</string>
   <string name="bote_connection_error">Bote 连接出错</string>
   <string name="full_error_copied_to_clipboard">完整的错误信息已复制到剪贴板</string>
-  <string name="pref_title_general">常规</string>
-  <string name="pref_summ_general">常规设置和默认身份设置</string>
   <string name="pref_title_autoMail">自动检查邮件</string>
   <string name="pref_title_checkInterval">检查间隔</string>
   <string name="pref_summ_checkInterval">%s 分钟</string>