diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 96f00957cccace8419b7ed8b560bc185d459a1e7..88859f405ef2319fe4103cb32a2c80efdb2d8ce5 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -991,8 +991,10 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
 				this.mAxolotlFingerprintBox.setVisibility(View.VISIBLE);
 				if (ownAxolotlFingerprint.equals(messageFingerprint)) {
 					this.mOwnFingerprintDesc.setTextColor(ContextCompat.getColor(this, R.color.accent));
+					this.mOwnFingerprintDesc.setText(R.string.omemo_fingerprint_selected_message);
 				} else {
 					this.mOwnFingerprintDesc.setTextColor(getSecondaryTextColor());
+					this.mOwnFingerprintDesc.setText(R.string.omemo_fingerprint);
 				}
 				this.mAxolotlFingerprint.setText(CryptoHelper.prettifyFingerprint(ownAxolotlFingerprint.substring(2)));
 				this.mAxolotlFingerprintToClipboardButton
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 9919f9f3a9c448cdf4ddb995bf75cc5609d92393..ba7e289f081b5425f9fd03aee90e065857f610c6 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -591,7 +591,7 @@
                             android:id="@+id/own_fingerprint_desc"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/this_device_omemo_fingerprint"
+                            android:text="@string/omemo_fingerprint"
                             android:textColor="?attr/color_text_secondary"
                             android:textSize="?attr/TextSizeInfo"/>
                     </LinearLayout>
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 38cd361df15b8adb8f1ba1f97dd20c1c981eee5d..802cc8c58e9193cd93c12c760f537226a7a11028 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -210,7 +210,6 @@
   <string name="openpgp_key_id">معرف ID مفتاح ال OpenPGP</string>
   <string name="omemo_fingerprint">بصمة OMEMO</string>
   <string name="omemo_fingerprint_x509">بصمة v\\OMEMO</string>
-  <string name="this_device_omemo_fingerprint">بصمة OMEMO الخاصة بك</string>
   <string name="other_devices">أجهزة أخرى</string>
   <string name="trust_omemo_fingerprints">ثق في بصمات أوميمو OMEMO</string>
   <string name="done">تم</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 58a0dfd6db61c895decb781ae61779c88b39f3fd..da27c86c9a16c48c48d0753f515e5ff3050e769d 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">Отпечатък v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Отпечатък OMEMO на съобщението</string>
   <string name="omemo_fingerprint_x509_selected_message">Отпечатък v\\OMEMO на съобщението</string>
-  <string name="this_device_omemo_fingerprint">Собствен отпечатък OMEMO</string>
   <string name="other_devices">Други устройства</string>
   <string name="trust_omemo_fingerprints">Доверяване на отпечатъци OMEMO</string>
   <string name="fetching_keys">Изтегляне на ключове…</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index dc362c7b4111297a335566f1cfa2ae541c986d51..8edbac31d1905f1f185e1b8954bb41ce2b7a0597 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -222,7 +222,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO otisk</string>
   <string name="omemo_fingerprint_selected_message">OMEMO otisk zprávy</string>
   <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO otisk zprávy</string>
-  <string name="this_device_omemo_fingerprint">Můj OMEMO otisk</string>
   <string name="other_devices">Ostatní přístroje</string>
   <string name="trust_omemo_fingerprints">Věřit OMEMO otiskům</string>
   <string name="fetching_keys">Získávání klíčů...</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index ef901905a6212957a1d4ae774499d6b950ace198..0ef8dc6b03b410b9d8c0236be2aedd1249c18050 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO-Fingerabdruck</string>
   <string name="omemo_fingerprint_selected_message">OMEMO-Fingerabdruck der Nachricht</string>
   <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO-Fingerabdruck der Nachricht</string>
-  <string name="this_device_omemo_fingerprint">Eigener OMEMO-Fingerabdruck</string>
   <string name="other_devices">Andere Geräte</string>
   <string name="trust_omemo_fingerprints">OMEMO-Fingerabdruck vertrauen</string>
   <string name="fetching_keys">Schlüssel werden abgerufen …</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 78067d6820a87529b678821a869809f9323a288c..f18cdc656055ab01326319be4aa2719ef3cfe409 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">Huella digital v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Huella digital OMEMO del mensaje</string>
   <string name="omemo_fingerprint_x509_selected_message">huella digital v\\OMEMO del mensaje</string>
-  <string name="this_device_omemo_fingerprint">Tu huella digital OMEMO</string>
   <string name="other_devices">Otros dispositivos</string>
   <string name="trust_omemo_fingerprints">Huellas digitales OMEMO de confianza</string>
   <string name="fetching_keys">Buscando claves...</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 9c87476b6091cbfa4f72a8ff3f036bee7fe02ca2..afe6fbd87d0ba6553d212a6523d51fc6f4055a52 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO hatz-marka</string>
   <string name="omemo_fingerprint_selected_message">Mezuaren OMEMO hatz-marka</string>
   <string name="omemo_fingerprint_x509_selected_message">Mezuaren v\\OMEMO hatz-marka</string>
-  <string name="this_device_omemo_fingerprint">Norberaren OMEMO hatz-marka</string>
   <string name="other_devices">Beste gailuak</string>
   <string name="trust_omemo_fingerprints">OMEMO hatz-marketaz fidatu</string>
   <string name="fetching_keys">Gakoak eskuratzen...</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 431fb88983930ec31e3f645459f9b37d5fc8bed8..6bf895240027750b0aa575adcaa3b60c64cbfff6 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">v\\Empreinte OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Empreinte OMEMO du message</string>
   <string name="omemo_fingerprint_x509_selected_message">v\\Empreinte OMEMO du message</string>
-  <string name="this_device_omemo_fingerprint">Votre empreinte OMEMO</string>
   <string name="other_devices">Autres appareils</string>
   <string name="trust_omemo_fingerprints">Faire confiance aux empreintes OMEMO</string>
   <string name="fetching_keys">Récupération des clefs...</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 6be07fadbab2c5939f5791921b2dd4a4c6be1938..72e60e33470eb583d8c67c886f7dcb8f1b5d9467 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -223,7 +223,6 @@
   <string name="omemo_fingerprint_x509">v\\pegada OMEMO </string>
   <string name="omemo_fingerprint_selected_message">Pegada OMEMO da mensaxe</string>
   <string name="omemo_fingerprint_x509_selected_message">v\\Pegada OMEMO da mensaxe</string>
-  <string name="this_device_omemo_fingerprint">Pegada OMEMO propia</string>
   <string name="other_devices">Outros dispositivos</string>
   <string name="trust_omemo_fingerprints">Confiar en pegadas OMEMO</string>
   <string name="fetching_keys">Obtendo chaves...</string>
diff --git a/src/main/res/values-hi-rIN/strings.xml b/src/main/res/values-hi-rIN/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c757504ac22ffabf690af242fcb45db770882057
--- /dev/null
+++ b/src/main/res/values-hi-rIN/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 15ca95ccced69dd6d35bfb7811c8c7b2d66b503f..b466ba3a8ce1ae4c0646bfc1d307261977c9c844 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO ujjlenyomat</string>
   <string name="omemo_fingerprint_selected_message">Az üzenet OMEMO ujjlenyomata</string>
   <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO ujjlenyomata az üzenetnek</string>
-  <string name="this_device_omemo_fingerprint">Saját OMEMO ujjlenyomat</string>
   <string name="other_devices">Más eszközök</string>
   <string name="trust_omemo_fingerprints">OMEMO ujjlenyomatokban megbízik</string>
   <string name="fetching_keys">Kulcsok beszerzése...</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 613f314d81fc8e85e31372be01a9cbd7800dcdf4..a6c0d301698ff8b8c4ff42ce9e15d0d74a06998e 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO impronta</string>
   <string name="omemo_fingerprint_selected_message">Impronta OMEMO del messaggio</string>
   <string name="omemo_fingerprint_x509_selected_message">Impronta v\\OMEMO del messaggio</string>
-  <string name="this_device_omemo_fingerprint">Propria impronta OMEMO</string>
   <string name="other_devices">Altri dispositivi</string>
   <string name="trust_omemo_fingerprints">Fidati delle impronte OMEMO</string>
   <string name="fetching_keys">Ricezione chiavi...</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 0afe253dc27ab7223ff400eaebb11a9b500f1932..e93b97394e9b4f139d5f32b3b462eb62f7bf773f 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -193,7 +193,6 @@
   <string name="otr_fingerprint">טביעת אצבע של OTR</string>
   <string name="omemo_fingerprint">טביעת אצבע של OMEMO</string>
   <string name="omemo_fingerprint_selected_message">טביעת אצבע OMEMO של ההודעה</string>
-  <string name="this_device_omemo_fingerprint">טביעת אצבע OMEMO שלי</string>
   <string name="other_devices">מכשירים אחרים</string>
   <string name="trust_omemo_fingerprints">סמוך על טביעות אצבע OMEMO</string>
   <string name="done">בוצע</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 7da6aa2a0487d0305421412e14ed80cd5f5b3bf4..a150506962add2f09bb09aa5d1641a0f291863ca 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO フィンガープリント</string>
   <string name="omemo_fingerprint_selected_message">メッセージの OMEMO フィンガープリント</string>
   <string name="omemo_fingerprint_x509_selected_message">メッセージの v\\OMEMO フィンガープリント</string>
-  <string name="this_device_omemo_fingerprint">自分の OMEMO フィンガープリント</string>
   <string name="other_devices">他のデバイス</string>
   <string name="trust_omemo_fingerprints">OMEMO フィンガープリントを信頼</string>
   <string name="fetching_keys">鍵の取得中…</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index e2cfaf354b359f9141a7747bfb196cc999263296..04b6fd66c1d7555fa8fd4a033d63772de8cbcacc 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -224,7 +224,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO 핑거프린트</string>
   <string name="omemo_fingerprint_selected_message">메세지의 OMEMO 핑거프린트</string>
   <string name="omemo_fingerprint_x509_selected_message">메세지의 v\\OMEMO 핑거프린트</string>
-  <string name="this_device_omemo_fingerprint">OMEMO 핑거프린트 소유</string>
   <string name="other_devices">다른 기기들</string>
   <string name="trust_omemo_fingerprints">OMEMO 핑거프린트 신뢰</string>
   <string name="fetching_keys">키 가져오는 중...</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 8441629d669c3a49cb2426fadd2f0b5315a228ef..03b907d669a2d258b0b0e155d122a7ecb3ca5b8d 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO-fingeravtrykk</string>
   <string name="omemo_fingerprint_selected_message">Meldingens OMEMO-fingeravtrykk</string>
   <string name="omemo_fingerprint_x509_selected_message">Meldingens v\\OMEMO-fingeravtrykk</string>
-  <string name="this_device_omemo_fingerprint">Eget OMEMO-fingeravtrykk</string>
   <string name="other_devices">Andre enheter</string>
   <string name="trust_omemo_fingerprints">Stol på OMEMO-fingeravtrykk</string>
   <string name="fetching_keys">Hener inn nøkler…</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index f80b847098d7248b8816f2207ab5110f8cc85e01..9b4f98d10905ffd6782ed767ea11b210b21fb5a3 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO-vingerafdruk</string>
   <string name="omemo_fingerprint_selected_message">OMEMO-vingerafdruk van bericht</string>
   <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO-vingerafdruk van bericht</string>
-  <string name="this_device_omemo_fingerprint">Eigen OMEMO-vingerafdruk</string>
   <string name="other_devices">Andere apparaten</string>
   <string name="trust_omemo_fingerprints">Vertrouw OMEMO-vingerafdrukken</string>
   <string name="fetching_keys">Sleutels ophalen…</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index a388321de4a801e0885947aa0e81b2725e83865d..976cdf3a1fc331e8ee3b960ce3a5079b4f97b129 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">Odcisk v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Odcisk OMEMO wiadomości</string>
   <string name="omemo_fingerprint_x509_selected_message">Odcisk v\\OMEMO wiadomości</string>
-  <string name="this_device_omemo_fingerprint">Własny odcisk OMEMO</string>
   <string name="other_devices">Pozostałe urządzenia</string>
   <string name="trust_omemo_fingerprints">Zaufane odciski OMEMO</string>
   <string name="fetching_keys">Pobieranie kluczy...</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index e0fad9c12b436a50ae807f88044c50036df935c8..e7bd6aea6717163deea8c5658523df0f377c1967 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">Impressão digital v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Impressão digital OMEMO da mensagem</string>
   <string name="omemo_fingerprint_x509_selected_message">Impressão digital v\\OMEMO da mensagem</string>
-  <string name="this_device_omemo_fingerprint">Impressão digital OMEMO própria</string>
   <string name="other_devices">Outros dispositivos</string>
   <string name="trust_omemo_fingerprints">Confiar nas impressões digitais OMEMO</string>
   <string name="fetching_keys">Buscando as chaves...</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index cba0ff511fbe98c11c45d0587805c1777f9513a1..944477a0a0fdb1eff3e0382d6dc2a69ea19d21fe 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -214,7 +214,6 @@
   <string name="omemo_fingerprint_x509">Impressão digital v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Impressão digital OMEMO da mensagem</string>
   <string name="omemo_fingerprint_x509_selected_message">Impressão digital v\\OMEMO da mensagem</string>
-  <string name="this_device_omemo_fingerprint">Impressão digital OMEMO própria</string>
   <string name="other_devices">Outros dispositivos</string>
   <string name="trust_omemo_fingerprints">Confiar nas impressões digitais OMEMO</string>
   <string name="fetching_keys">Obtendo as chaves...</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index b0156bf404bc2138542157a9eb9e4d8443d9272b..80bfd076cb0985dcbb3dba3ccb9cd271c5d35d62 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">Amprenta v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Amprenta OMEMO a mesajului</string>
   <string name="omemo_fingerprint_x509_selected_message">Amprenta v\\OMEMO a mesajului</string>
-  <string name="this_device_omemo_fingerprint">Amprenta OMEMO proprie</string>
   <string name="other_devices">Alte dispozitive</string>
   <string name="trust_omemo_fingerprints">Amprente OMEMO de incredere</string>
   <string name="fetching_keys">Se preiau cheile...</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index fa1182706d655a8b4583a94250f3b37dffbddd82..8c900d217d409c6138b903b2b91b4f0b3be755d2 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -168,12 +168,14 @@
   <string name="mgmt_account_disable">Временно отключить</string>
   <string name="mgmt_account_publish_avatar">Разместить аватар</string>
   <string name="mgmt_account_publish_pgp">Анонсировать OpenPGP ключ</string>
+  <string name="unpublish_pgp">Удалить открытый OpenPGP ключ</string>
   <string name="openpgp_has_been_published">Открытый ключ OpenPGP был опубликован.</string>
   <string name="republish_pgp_keys">Не забудьте повторно анонсировать свои OpenPGP ключи!</string>
   <string name="mgmt_account_enable">Включить аккаунт</string>
   <string name="mgmt_account_are_you_sure">Вы уверены?</string>
   <string name="attach_record_voice">Запись голоса</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
+  <string name="block_jabber_id">Заблокировать Jabber ID</string>
   <string name="account_settings_password">Пароль</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="account_settings_confirm_password">Подтвердите пароль</string>
@@ -224,7 +226,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO отпечаток</string>
   <string name="omemo_fingerprint_selected_message">OMEMO отпечаток сообщения</string>
   <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO отпечаток сообщения</string>
-  <string name="this_device_omemo_fingerprint">Собственный OMEMO отпечаток</string>
   <string name="other_devices">Другие устройства</string>
   <string name="trust_omemo_fingerprints">Доверенные отпечатки OMEMO</string>
   <string name="fetching_keys">Получение ключей…</string>
@@ -329,6 +330,7 @@
   <string name="check_x_filesize_on_host">Проверить размер %1$s на %2$s</string>
   <string name="message_options">Опции сообщения</string>
   <string name="select_text">Выбрать текст</string>
+  <string name="quote">Цитировать</string>
   <string name="copy_original_url">Копировать адрес ссылки</string>
   <string name="send_again">Отправить ещё раз</string>
   <string name="file_url">URL файла</string>
@@ -466,6 +468,7 @@
   <string name="disable_account">Отключить аккаунт</string>
   <string name="contact_is_typing">%s печатает…</string>
   <string name="contact_has_stopped_typing">%s прекратил набор</string>
+  <string name="contacts_are_typing">%s набирает...</string>
   <string name="pref_chat_states">Оповещения о наборе</string>
   <string name="pref_chat_states_summary">Позволяет вашим контактам видеть когда вы пишете им новое сообщение</string>
   <string name="send_location">Отправить местоположение</string>
@@ -678,4 +681,24 @@
   <string name="blindly_trusted_omemo_keys">Слепо доверенные OMEMO ключи</string>
   <string name="not_trusted">Недоверенный</string>
   <string name="invalid_barcode">Некорректный 2D штрихкод</string>
+  <string name="pref_clean_cache">Очистить кэш</string>
+  <string name="pref_clean_private_storage">Очистить приватное хранилище.</string>
+  <string name="verify_omemo_keys">Проверить OMEMO ключ</string>
+  <string name="show_inactive_devices">Показать неактивные устройста</string>
+  <string name="hide_inactive_devices">Спрятать неактивные устройства</string>
+  <string name="timeout_24_hours">24 часа</string>
+  <string name="timeout_7_days">7 дней</string>
+  <string name="timeout_30_days">30 дней</string>
+  <string name="timeout_6_months">6 месяцев</string>
+  <string name="pref_automatically_delete_messages">Автоматическое удаление сообщений</string>
+  <string name="transcoding_video_progress">Сжатие видео (%s %% завершено)</string>
+  <string name="contact_blocked_past_tense">Контакт заблокирован</string>
+  <string name="block_entire_domain">Заблокировать весь домен</string>
+  <string name="account_status_regis_web">Сервер требует регистрации на сайте</string>
+  <string name="open_website">Открыть сайт</string>
+  <string name="today">Сегодня</string>
+  <string name="yesterday">Вчера</string>
+  <string name="pref_validate_hostname">Проверить имя сервера с помощью DNSSEC</string>
+  <string name="network_is_unreachable">Сеть недоступна</string>
+  <string name="certificate_does_not_contain_jid">Сертификат не содержит Jabber ID</string>
 </resources>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 14e72360d1152d91b7304726fedd90b116b48e17..e13f76fbd2332b902aab6bf20f37e89ae98b85b6 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -190,7 +190,6 @@
   <string name="otr_fingerprint">OTR identifikátor</string>
   <string name="omemo_fingerprint">OMEMO identifikátor</string>
   <string name="omemo_fingerprint_selected_message">OMEMO identifkátor správy</string>
-  <string name="this_device_omemo_fingerprint">Vlastný OMEMO identifikátor</string>
   <string name="other_devices">Ostatné zariadenia</string>
   <string name="trust_omemo_fingerprints">Dôverovať OMEMO identifikátoru</string>
   <string name="done">Dokončený</string>
diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c757504ac22ffabf690af242fcb45db770882057
--- /dev/null
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 8e441fd31c69d2ef230539a409480fa927b2862f..d56658c8d2cf08102e3b5efcee190bb5ed1814d0 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -226,7 +226,6 @@
   <string name="omemo_fingerprint_x509">v\\ОМЕМО отисак</string>
   <string name="omemo_fingerprint_selected_message">ОМЕМО отисак поруке</string>
   <string name="omemo_fingerprint_x509_selected_message">v\\ОМЕМО отисак поруке</string>
-  <string name="this_device_omemo_fingerprint">Сопствени ОМЕМО отисак</string>
   <string name="other_devices">Остали уређаји</string>
   <string name="trust_omemo_fingerprints">Поуздај се у ОМЕМО отиске</string>
   <string name="fetching_keys">Добављам кључеве…</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 4469fae0eb7e6ffbf16b8afcff7d2408ab3bae5d..58b4873d0bb884b1d986abf7e884709b924b2965 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -229,7 +229,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO-fingeravtryck</string>
   <string name="omemo_fingerprint_selected_message">Meddelandets OMEMO-fingeravtryck</string>
   <string name="omemo_fingerprint_x509_selected_message">Meddelandets v\\OMEMO-fingeravtryck</string>
-  <string name="this_device_omemo_fingerprint">Eget OMEMO-fingeravtryck</string>
   <string name="other_devices">Andra enheter</string>
   <string name="trust_omemo_fingerprints">Lita på OMEMO-fingeravtryck</string>
   <string name="fetching_keys">Hämtar nycklar...</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index cf82b2b32a615ed4d8f91cf16c4756c8f3739632..c9bafd2a2f3bed2195c5ea6afde248ee90fbc5fd 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -225,7 +225,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO parmak izi</string>
   <string name="omemo_fingerprint_selected_message">İletinin OMEMO parmak izi</string>
   <string name="omemo_fingerprint_x509_selected_message">v\\İletinin OMEMO parmak izi</string>
-  <string name="this_device_omemo_fingerprint">OMEMO parmak iziniz</string>
   <string name="other_devices">Diğer aygıtlar</string>
   <string name="trust_omemo_fingerprints">OMEMO parmak izlerine güven</string>
   <string name="fetching_keys">Anahtarları alıyor…</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index a514f6db37d6ef31f077418043e4d5c8dff46489..d315ecf4723dc8f75bd2acfad5d34e6e6d5fe315 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">Відбиток v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Відбиток OMEMO повідомлення</string>
   <string name="omemo_fingerprint_x509_selected_message">Відбиток v\\OMEMO повідомлення</string>
-  <string name="this_device_omemo_fingerprint">Власний відбиток OMEMO</string>
   <string name="other_devices">Інші пристрої</string>
   <string name="trust_omemo_fingerprints">Довіряти відбиткам OMEMO</string>
   <string name="fetching_keys">Отримую ключі…</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index e263894eb6ef72c8256fc5e3b2e2e1520ca7daea..2ea9d9305b98e13f4a8e91bb7f1f5a084aff7d25 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -224,7 +224,6 @@
   <string name="omemo_fingerprint_x509">Dấu vân tay v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Dấu vân tay OMEMO của tin nhắn</string>
   <string name="omemo_fingerprint_x509_selected_message">Dấu vân tay v\\OMEMO của tin nhắn</string>
-  <string name="this_device_omemo_fingerprint">Dấu vân tay OMEMO thiết bị</string>
   <string name="other_devices">Các thiết bị khác</string>
   <string name="trust_omemo_fingerprints">Tin tưởng các dấu vân tay OMEMO</string>
   <string name="fetching_keys">Đang nhận khoá...</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 48516e44500ba5bcee73a5564c37b2f59e634a2c..aa69f27d961941e0ce8f54522dae547aa5552639 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -230,7 +230,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO 指纹</string>
   <string name="omemo_fingerprint_selected_message">消息的 OMEMO 指纹</string>
   <string name="omemo_fingerprint_x509_selected_message">消息的 OMEMO 指纹</string>
-  <string name="this_device_omemo_fingerprint">自己的 OMEMO 指纹</string>
   <string name="other_devices">其他设备</string>
   <string name="trust_omemo_fingerprints">信任的 OMEMO 指纹</string>
   <string name="fetching_keys">获取密钥中</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index da23c6631ae3e19a7c3e3c0b06eda8a8919a3034..2fb5c551525da2e3eb8a4757c90be03f63f3bb2e 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -229,7 +229,6 @@
   <string name="omemo_fingerprint_x509">v\\OMEMO 指紋</string>
   <string name="omemo_fingerprint_selected_message">消息的 OMEMO 指紋</string>
   <string name="omemo_fingerprint_x509_selected_message">消息的 OMEMO 指紋</string>
-  <string name="this_device_omemo_fingerprint">自己的 OMEMO 指紋</string>
   <string name="other_devices">其他設備</string>
   <string name="trust_omemo_fingerprints">信任的 OMEMO 指紋</string>
   <string name="fetching_keys">獲取金鑰中</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 37f2ae96002b11678a36bcb68f6b27400c237f94..cc5448b20705b4888fea7d60dc4bf99aae43858a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -231,7 +231,6 @@
 	<string name="omemo_fingerprint_x509">v\\OMEMO fingerprint</string>
 	<string name="omemo_fingerprint_selected_message">OMEMO fingerprint of message</string>
 	<string name="omemo_fingerprint_x509_selected_message">v\\OMEMO fingerprint of message</string>
-	<string name="this_device_omemo_fingerprint">Own OMEMO fingerprint</string>
 	<string name="other_devices">Other devices</string>
 	<string name="trust_omemo_fingerprints">Trust OMEMO Fingerprints</string>
 	<string name="fetching_keys">Fetching keys…</string>